From 502135df9f0d839e75907260f5dcdab4052d995e Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Sun, 23 Sep 2012 13:39:01 +1000
Subject: [PATCH] lib/replace: Try to fix build on HP-UX for os2_delete test

The issue is that this file is both used in an autoconf test, and
later in a smbtorture test.  Because os2_delete.c does not include
replace.h, bool may not be defined.

So, instead we shift the need for bool to a different header.

(The readdir tests in repdir.m4 are not yet in the waf configure).

Andrew Bartlett
---
 lib/replace/replace-test.h      | 4 ----
 lib/replace/replace-testsuite.h | 9 +++------
 lib/replace/test/main.c         | 4 +---
 lib/replace/test/testsuite.c    | 6 ++----
 source4/torture/local/local.c   | 2 +-
 5 files changed, 7 insertions(+), 18 deletions(-)

diff --git a/lib/replace/replace-test.h b/lib/replace/replace-test.h
index a522853351c..ed8e75e3b11 100644
--- a/lib/replace/replace-test.h
+++ b/lib/replace/replace-test.h
@@ -1,10 +1,6 @@
 #ifndef __LIB_REPLACE_REPLACE_TEST_H__
 #define __LIB_REPLACE_REPLACE_TEST_H__
 
-#include <stdbool.h>
-struct torture_context;
-
-bool torture_local_replace(struct torture_context *ctx);
 int libreplace_test_strptime(void);
 int test_readdir_os2_delete(void);
 int getifaddrs_test(void);
diff --git a/lib/replace/replace-testsuite.h b/lib/replace/replace-testsuite.h
index a522853351c..b28dbec0671 100644
--- a/lib/replace/replace-testsuite.h
+++ b/lib/replace/replace-testsuite.h
@@ -1,13 +1,10 @@
-#ifndef __LIB_REPLACE_REPLACE_TEST_H__
-#define __LIB_REPLACE_REPLACE_TEST_H__
+#ifndef __LIB_REPLACE_REPLACE_TESTSUITE_H__
+#define __LIB_REPLACE_REPLACE_TESTSUITE_H__
 
 #include <stdbool.h>
 struct torture_context;
 
 bool torture_local_replace(struct torture_context *ctx);
-int libreplace_test_strptime(void);
-int test_readdir_os2_delete(void);
-int getifaddrs_test(void);
 
-#endif /* __LIB_REPLACE_REPLACE_TEST_H__ */
+#endif /* __LIB_REPLACE_REPLACE_TESTSUITE_H__ */
 
diff --git a/lib/replace/test/main.c b/lib/replace/test/main.c
index 9bd12840a5b..94264d73672 100644
--- a/lib/replace/test/main.c
+++ b/lib/replace/test/main.c
@@ -24,9 +24,7 @@
 */
 
 #include "replace.h"
-
-struct torture_context;
-bool torture_local_replace(struct torture_context *ctx);
+#include "replace-testsuite.h"
 
 int main(void)
 {
diff --git a/lib/replace/test/testsuite.c b/lib/replace/test/testsuite.c
index 0c1fac67a0e..04658bea059 100644
--- a/lib/replace/test/testsuite.c
+++ b/lib/replace/test/testsuite.c
@@ -24,6 +24,8 @@
 */
 
 #include "replace.h"
+#include "replace-test.h"
+#include "replace-testsuite.h"
 
 /*
   we include all the system/ include files here so that libreplace tests
@@ -48,8 +50,6 @@
 
 #define TESTFILE "testfile.dat"
 
-struct torture_context;
-bool torture_local_replace(struct torture_context *ctx);
 
 /*
   test ftruncate() function
@@ -379,8 +379,6 @@ static int test_opendir(void)
 	return true;
 }
 
-extern int test_readdir_os2_delete(void);
-
 static int test_readdir(void)
 {
 	printf("test: readdir\n");
diff --git a/source4/torture/local/local.c b/source4/torture/local/local.c
index c0b3305462a..d4e891116f2 100644
--- a/source4/torture/local/local.c
+++ b/source4/torture/local/local.c
@@ -24,7 +24,7 @@
 #include "torture/auth/proto.h"
 #include "../lib/crypto/test_proto.h"
 #include "lib/registry/tests/proto.h"
-#include "lib/replace/replace-test.h"
+#include "lib/replace/replace-testsuite.h"
 
 /* ignore me */ static struct torture_suite *
 	(*suite_generators[]) (TALLOC_CTX *mem_ctx) =
-- 
2.11.4.GIT