summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-11-24 11:43:56 +0100
committerStefan Metzmacher <metze@samba.org>2009-11-24 11:47:30 +0100
commita46b63fd98399700183cddb773c85521987ff132 (patch)
tree77c0e8bb46f5efa490fb1ba5bfdfd2612a941805 /source3
parent95d0f0aab01fdd751841d57cebe6150cd6fdf80c (diff)
downloadsamba-a46b63fd98399700183cddb773c85521987ff132.tar.gz
samba-a46b63fd98399700183cddb773c85521987ff132.tar.bz2
samba-a46b63fd98399700183cddb773c85521987ff132.zip
s3:fix the merged build of bin/smbtorture4
Michael
Diffstat (limited to 'source3')
-rw-r--r--source3/torture/denytest.c2
-rw-r--r--source3/torture/mangle_test.c2
-rw-r--r--source3/torture/nbio.c2
-rw-r--r--source3/torture/proto.h (renamed from source3/torture/torture.h)0
-rw-r--r--source3/torture/scanner.c2
-rw-r--r--source3/torture/torture.c2
-rw-r--r--source3/torture/utable.c2
7 files changed, 6 insertions, 6 deletions
diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c
index bf491bc22e..4762bf7d0e 100644
--- 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 e5f69479a5..594caba604 100644
--- 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 5e7a458025..063df1693f 100644
--- 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
index 353b98cff3..353b98cff3 100644
--- a/source3/torture/torture.h
+++ b/source3/torture/proto.h
diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 4d9ee286e8..d7f4d2eabf 100644
--- 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 19103dfbef..5407f3c20e 100644
--- 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 247642b044..f5afeb7adc 100644
--- 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)
{