s3:fix the merged build of bin/smbtorture4

Michael

diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index bf491bc22ee93648e6b845c2db3537814367d6e3..4762bf7d0ebafe0ab86a13b2a9ba230c9adb4b39 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 e5f69479a502d624dc6966c733e5a7e5a2f5ec45..594caba6043e3d1a618721542e6209d3f7c868e2 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 5e7a458025ae27f9b8abe22ffeacfb5ecfe5c2b4..063df1693f56e41862aebe97d1d6f70421374f56 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 4d9ee286e828c986a0fa1832b9c339160ea9ce3f..d7f4d2eabfba29a21ba7d3d042ed322987736da7 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 19103dfbeff93992c54ec34f5b0a74d0f218a999..5407f3c20eeb98d1619f12c92c10a252d34820b3 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -20,7 +20,7 @@
 
 #include "includes.h"
 #include "nsswitch/libwbclient/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 247642b04470e253638b117837bc6b30be29a4ef..f5afeb7adc16d4884c2ef1fa9f677ed57539e677 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)
 {