summaryrefslogtreecommitdiff
path: root/source3/lib/replace
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2007-01-15 19:28:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:17:09 -0500
commit14ddce8b64b559e0db25e2b79dd16d8f3d9aff26 (patch)
treef01eae111c55362dec2527c87138a3666c014d6d /source3/lib/replace
parent2f66beb8adf679ed1e2e36f9c808c43f095e23cf (diff)
downloadsamba-14ddce8b64b559e0db25e2b79dd16d8f3d9aff26.tar.gz
samba-14ddce8b64b559e0db25e2b79dd16d8f3d9aff26.tar.bz2
samba-14ddce8b64b559e0db25e2b79dd16d8f3d9aff26.zip
r20820: merge from samba4:
- include system/aio.h - use full prototype for main - use ifdef instead if metze (This used to be commit 024dd7d7c95bcf8d77914dc2063f16220358e690)
Diffstat (limited to 'source3/lib/replace')
-rw-r--r--source3/lib/replace/system/aio.h2
-rw-r--r--source3/lib/replace/test/testsuite.c3
2 files changed, 3 insertions, 2 deletions
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 <libaio.h>
#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)