From 14ddce8b64b559e0db25e2b79dd16d8f3d9aff26 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 15 Jan 2007 19:28:02 +0000 Subject: r20820: merge from samba4: - include system/aio.h - use full prototype for main - use ifdef instead if metze (This used to be commit 024dd7d7c95bcf8d77914dc2063f16220358e690) --- source3/lib/replace/system/aio.h | 2 +- source3/lib/replace/test/testsuite.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'source3') diff --git a/source3/lib/replace/system/aio.h b/source3/lib/replace/system/aio.h index e1b9d836e7..45154ccb27 100644 --- a/source3/lib/replace/system/aio.h +++ b/source3/lib/replace/system/aio.h @@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -#if HAVE_LIBAIO_H +#ifdef HAVE_LIBAIO_H #include #endif diff --git a/source3/lib/replace/test/testsuite.c b/source3/lib/replace/test/testsuite.c index 8a9fb9ab87..effbdb13ef 100644 --- a/source3/lib/replace/test/testsuite.c +++ b/source3/lib/replace/test/testsuite.c @@ -46,6 +46,7 @@ #include "system/terminal.h" #include "system/time.h" #include "system/wait.h" +#include "system/aio.h" #define TESTFILE "testfile.dat" @@ -470,7 +471,7 @@ bool torture_local_replace(struct torture_context *ctx) } #if _SAMBA_BUILD_<4 -int main() +int main(void) { bool ret = torture_local_replace(NULL); if (ret) -- cgit