From a46b63fd98399700183cddb773c85521987ff132 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 24 Nov 2009 11:43:56 +0100 Subject: [PATCH] s3:fix the merged build of bin/smbtorture4 Michael --- source3/torture/denytest.c | 2 +- source3/torture/mangle_test.c | 2 +- source3/torture/nbio.c | 2 +- source3/torture/{torture.h => proto.h} | 0 source3/torture/scanner.c | 2 +- source3/torture/torture.c | 2 +- source3/torture/utable.c | 2 +- 7 files changed, 6 insertions(+), 6 deletions(-) rename source3/torture/{torture.h => proto.h} (100%) diff --git a/source3/torture/denytest.c b/source3/torture/denytest.c index bf491bc22ee..4762bf7d0eb 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 e5f69479a50..594caba6043 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 5e7a458025a..063df1693f5 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 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 4d9ee286e82..d7f4d2eabfb 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 19103dfbeff..5407f3c20ee 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 247642b0447..f5afeb7adc1 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) { -- 2.34.1