diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-23 13:39:01 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-23 14:31:01 +1000 |
| commit | 502135df9f0d839e75907260f5dcdab4052d995e (patch) | |
| tree | 8a8de1389044455696e6036dc15601ea7adb19e0 /lib/replace | |
| parent | 08d3062fc3ece6b5d98e32bad5f1d54c088b0dd0 (diff) | |
| download | samba-502135df9f0d839e75907260f5dcdab4052d995e.tar.gz samba-502135df9f0d839e75907260f5dcdab4052d995e.tar.bz2 samba-502135df9f0d839e75907260f5dcdab4052d995e.zip | |
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
Diffstat (limited to 'lib/replace')
| -rw-r--r-- | lib/replace/replace-test.h | 4 | ||||
| -rw-r--r-- | lib/replace/replace-testsuite.h | 9 | ||||
| -rw-r--r-- | lib/replace/test/main.c | 4 | ||||
| -rw-r--r-- | lib/replace/test/testsuite.c | 6 |
4 files changed, 6 insertions, 17 deletions
diff --git a/lib/replace/replace-test.h b/lib/replace/replace-test.h index a522853351..ed8e75e3b1 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 a522853351..b28dbec067 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 9bd12840a5..94264d7367 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 0c1fac67a0..04658bea05 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"); |