svn commit: samba r20820 - in branches/SAMBA_3_0/source/lib/replace: system test

[metze at samba.org]

Author: metze
Date: 2007-01-15 19:28:02 +0000 (Mon, 15 Jan 2007)
New Revision: 20820

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20820

Log:
merge from samba4:

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

metze
Modified:
   branches/SAMBA_3_0/source/lib/replace/system/aio.h
   branches/SAMBA_3_0/source/lib/replace/test/testsuite.c


Changeset:
Modified: branches/SAMBA_3_0/source/lib/replace/system/aio.h
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/system/aio.h	2007-01-15 19:27:45 UTC (rev 20819)
+++ branches/SAMBA_3_0/source/lib/replace/system/aio.h	2007-01-15 19:28:02 UTC (rev 20820)
@@ -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
 

Modified: branches/SAMBA_3_0/source/lib/replace/test/testsuite.c
===================================================================
--- branches/SAMBA_3_0/source/lib/replace/test/testsuite.c	2007-01-15 19:27:45 UTC (rev 20819)
+++ branches/SAMBA_3_0/source/lib/replace/test/testsuite.c	2007-01-15 19:28:02 UTC (rev 20820)
@@ -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 @@
 }
 
 #if _SAMBA_BUILD_<4
-int main()
+int main(void)
 {
 	bool ret = torture_local_replace(NULL);
 	if (ret)