r20820: merge from samba4:

- include system/aio.h
- use full prototype for main
- use ifdef instead if

metze
(This used to be commit 024dd7d7c95bcf8d77914dc2063f16220358e690)

diff --git a/source3/lib/replace/system/aio.h b/source3/lib/replace/system/aio.h
index e1b9d836e79da2f58c4064c072fb163e535a11a1..45154ccb27a6816f75ee0dfbb75c1feda2a5757d 100644 (file)
--- 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 8a9fb9ab876d6343165591a26f3554b39302b11f..effbdb13ef0f0214600ce3b1ef5160e05c03541b 100644 (file)
--- 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)