svn commit: samba r20821 - in
branches/SAMBA_3_0_24/source/lib/replace: system test
metze at samba.org
metze at samba.org
Mon Jan 15 19:28:25 GMT 2007
Author: metze
Date: 2007-01-15 19:28:24 +0000 (Mon, 15 Jan 2007)
New Revision: 20821
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=20821
Log:
merge from samba4:
- include system/aio.h
- use full prototype for main
- use ifdef instead if
metze
Modified:
branches/SAMBA_3_0_24/source/lib/replace/system/aio.h
branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c
Changeset:
Modified: branches/SAMBA_3_0_24/source/lib/replace/system/aio.h
===================================================================
--- branches/SAMBA_3_0_24/source/lib/replace/system/aio.h 2007-01-15 19:28:02 UTC (rev 20820)
+++ branches/SAMBA_3_0_24/source/lib/replace/system/aio.h 2007-01-15 19:28:24 UTC (rev 20821)
@@ -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_24/source/lib/replace/test/testsuite.c
===================================================================
--- branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c 2007-01-15 19:28:02 UTC (rev 20820)
+++ branches/SAMBA_3_0_24/source/lib/replace/test/testsuite.c 2007-01-15 19:28:24 UTC (rev 20821)
@@ -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)
More information about the samba-cvs
mailing list