diff options
| author | Günther Deschner <gd@samba.org> | 2011-04-20 17:54:24 +0200 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2011-04-20 18:16:28 +0200 |
| commit | ae61a5c3d05192457f5a0b24dd9bd34317df566f (patch) | |
| tree | eb424f233c3ac4bd2aac9423aee3b049f7d8d374 | |
| parent | c8f9515f193e634da2ef01c525e2a05a3d519862 (diff) | |
| download | samba-ae61a5c3d05192457f5a0b24dd9bd34317df566f.tar.gz | |
s3-smbd: fix the AIX 5.3 build.
(AIX defines open to be open64)
Guenther
| -rw-r--r-- | source3/modules/vfs_aixacl_util.c | 1 | ||||
| -rw-r--r-- | source3/modules/vfs_default.c | 4 | ||||
| -rw-r--r-- | source3/printing/print_aix.c | 1 | ||||
| -rw-r--r-- | source3/smbd/vfs.c | 3 |
4 files changed, 9 insertions, 0 deletions
diff --git a/source3/modules/vfs_aixacl_util.c b/source3/modules/vfs_aixacl_util.c index 768d0f33585..d867f9d92fc 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 859b2120486..4e993e16664 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 1b236106280..b7198d36322 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 0438f7934ed..aaa713e4809 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); } |