s3:fix the merged build of bin/smbtorture4

Michael

diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index bee8cc05daf63a8c67d5c8cdf411c4a3bf73f043..da467dfef70205a7cac553bfcf8ff77577373143 100644 (file)
--- a/source3/torture/denytest.c
+++ b/source3/torture/denytest.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "torture.h"
+#include "torture/proto.h"
 
 extern bool torture_showall;
 

diff --git a/source3/torture/mangle_test.c b/source3/torture/mangle_test.c
index 3ce866ba54fe701b12dcce290c68ed1fe35a079c..0b0cd8f748432e2b6ed8fa7f828ce6d8ab3db678 100644 (file)
--- a/source3/torture/mangle_test.c
+++ b/source3/torture/mangle_test.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "torture.h"
+#include "torture/proto.h"
 
 extern int torture_numops;
 

diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index 3414f2d1de80a76e1cb1748ce01aaa80b1cf26ee..227a2c21cde7509d62b07a9be6c3884b1a54cc26 100644 (file)
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "torture.h"
+#include "torture/proto.h"
 
 #define MAX_FILES 1000
 

diff --git a/source3/torture/torture.h b/source3/torture/proto.h
similarity index 100%
rename from source3/torture/torture.h
rename to source3/torture/proto.h

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 23566851be6c1cf02dc059241ad85af701765e09..9698b40cc9e721dc9568b3ed2271b77d3e834957 100644 (file)
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "torture.h"
+#include "torture/proto.h"
 
 #define VERBOSE 0
 #define OP_MIN 0

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 96dcdd6f0c59f651285279bdcebf4eb14fd03082..92ebfe4a0b37d757b7257ed0bf777a780a628061 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -19,7 +19,7 @@
 
 #include "includes.h"
 #include "wbc_async.h"
-#include "torture.h"
+#include "torture/proto.h"
 
 extern char *optarg;
 extern int optind;

diff --git a/source3/torture/utable.c b/source3/torture/utable.c
index 69b79cf311384d12e010eeb4207a3749fa0221fa..2ea65635ab963ca6f5d3ce514660a1398d08f0b8 100644 (file)
--- a/source3/torture/utable.c
+++ b/source3/torture/utable.c
@@ -18,7 +18,7 @@
 */
 
 #include "includes.h"
-#include "torture.h"
+#include "torture/proto.h"
 
 bool torture_utable(int dummy)
 {