summaryrefslogtreecommitdiff
path: root/source4/ntvfs
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-26 00:10:57 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:04:27 -0500
commit2319864a32f28748cce912845f8bcc17439abe30 (patch)
tree75f9f33de8c400ee1565527e2e22243dce1f8ee6 /source4/ntvfs
parent0263ec1c894c46a479b472d65dc5f3ce48c57673 (diff)
downloadsamba-2319864a32f28748cce912845f8bcc17439abe30.tar.gz
samba-2319864a32f28748cce912845f8bcc17439abe30.tar.bz2
samba-2319864a32f28748cce912845f8bcc17439abe30.zip
r15261: Work around AIX defining open as open64 again
(This used to be commit 05f5f3da8f08fb36f9709fa40b6b84ed1f948f3c)
Diffstat (limited to 'source4/ntvfs')
-rw-r--r--source4/ntvfs/nbench/vfs_nbench.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source4/ntvfs/nbench/vfs_nbench.c b/source4/ntvfs/nbench/vfs_nbench.c
index 0a5dff9bd0..77de979153 100644
--- a/source4/ntvfs/nbench/vfs_nbench.c
+++ b/source4/ntvfs/nbench/vfs_nbench.c
@@ -25,8 +25,8 @@
*/
#include "includes.h"
-#include "system/filesys.h"
#include "ntvfs/ntvfs.h"
+#include "system/filesys.h"
/* this is stored in ntvfs_private */
struct nbench_private {
@@ -314,7 +314,7 @@ static NTSTATUS nbench_open(struct ntvfs_module_context *ntvfs,
{
NTSTATUS status;
-#undef open
+#undef open /* AIX defines open to be open64 */
PASS_THRU_REQ(ntvfs, req, open, io, (ntvfs, req, io));
return status;