svn commit: samba r15261 - in branches/SAMBA_4_0/source/ntvfs/nbench: .

jelmer at samba.org jelmer at samba.org
Wed Apr 26 00:10:59 GMT 2006


Author: jelmer
Date: 2006-04-26 00:10:57 +0000 (Wed, 26 Apr 2006)
New Revision: 15261

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

Log:
Work around AIX defining open as open64 again

Modified:
   branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c	2006-04-26 00:08:39 UTC (rev 15260)
+++ branches/SAMBA_4_0/source/ntvfs/nbench/vfs_nbench.c	2006-04-26 00:10:57 UTC (rev 15261)
@@ -25,8 +25,8 @@
 */
 
 #include "includes.h"
+#include "ntvfs/ntvfs.h"
 #include "system/filesys.h"
-#include "ntvfs/ntvfs.h"
 
 /* this is stored in ntvfs_private */
 struct nbench_private {
@@ -314,7 +314,7 @@
 {
 	NTSTATUS status;
 
-#undef open
+#undef open /* AIX defines open to be open64 */
 	PASS_THRU_REQ(ntvfs, req, open, io, (ntvfs, req, io));
 
 	return status;



More information about the samba-cvs mailing list