summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2011-04-20 17:54:24 +0200
committerGünther Deschner <gd@samba.org>2011-04-20 18:16:28 +0200
commitae61a5c3d05192457f5a0b24dd9bd34317df566f (patch)
treeeb424f233c3ac4bd2aac9423aee3b049f7d8d374
parentc8f9515f193e634da2ef01c525e2a05a3d519862 (diff)
downloadsamba-ae61a5c3d05192457f5a0b24dd9bd34317df566f.tar.gz
samba-ae61a5c3d05192457f5a0b24dd9bd34317df566f.tar.bz2
samba-ae61a5c3d05192457f5a0b24dd9bd34317df566f.zip
s3-smbd: fix the AIX 5.3 build.
(AIX defines open to be open64) Guenther
-rw-r--r--source3/modules/vfs_aixacl_util.c1
-rw-r--r--source3/modules/vfs_default.c4
-rw-r--r--source3/printing/print_aix.c1
-rw-r--r--source3/smbd/vfs.c3
4 files changed, 9 insertions, 0 deletions
diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c
index 768d0f3358..d867f9d92f 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "smbd/smbd.h"
SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 859b212048..4e993e1666 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1649,6 +1649,10 @@ static int vfswrap_set_offline(struct vfs_handle_struct *handle,
return -1;
}
+#ifdef AIX
+#undef open /* AIX defines open to be open64 */
+#endif
+
static struct vfs_fn_pointers vfs_default_fns = {
/* Disk operations */
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index 1b23610628..b7198d3632 100644
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -25,6 +25,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "printing/pcap.h"
#ifdef AIX
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 0438f7934e..aaa713e480 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1273,6 +1273,9 @@ int smb_vfs_call_open(struct vfs_handle_struct *handle,
struct smb_filename *smb_fname, struct files_struct *fsp,
int flags, mode_t mode)
{
+#ifdef AIX
+#undef open /* AIX defines open to be open64 */
+#endif
VFS_FIND(open);
return handle->fns->open(handle, smb_fname, fsp, flags, mode);
}