diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-10-05 00:32:09 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-10-05 00:32:09 +0000 |
| commit | 791b837af196c895d17512a9a72e293f0c4ef32e (patch) | |
| tree | 025b246680d9a714cea89c35c8aabdf75aa7c3a3 | |
| parent | dde4b88a02493b86b9a74fc9685e423d88101fbf (diff) | |
| download | samba-791b837af196c895d17512a9a72e293f0c4ef32e.tar.gz samba-791b837af196c895d17512a9a72e293f0c4ef32e.tar.bz2 samba-791b837af196c895d17512a9a72e293f0c4ef32e.zip | |
don't define creat() under linux until we get the CREAT_BITS stuff
sorted out.
(This used to be commit 86b66d92772d4a72b7b8c7f2d8d793533d7f6130)
| -rw-r--r-- | source3/smbwrapper/wrapped.c | 5 | ||||
| -rw-r--r-- | source3/smbwrapper/wrapper.h | 6 |
2 files changed, 9 insertions, 2 deletions
diff --git a/source3/smbwrapper/wrapped.c b/source3/smbwrapper/wrapped.c index 502a2a9113..50f78ce005 100644 --- a/source3/smbwrapper/wrapped.c +++ b/source3/smbwrapper/wrapped.c @@ -622,8 +622,9 @@ __asm__(".globl _write; _write = write"); } #endif +#ifndef LINUX int creat(const char *path, mode_t mode) { - /* drat, including sys/fcntl.h gives conflicts */ - return open(path, 01101, mode); + return open(path, O_WRONLY|O_CREAT|O_TRUNC, mode); } +#endif diff --git a/source3/smbwrapper/wrapper.h b/source3/smbwrapper/wrapper.h index fec400a724..3eccdcac1e 100644 --- a/source3/smbwrapper/wrapper.h +++ b/source3/smbwrapper/wrapper.h @@ -31,6 +31,12 @@ #include <sys/acl.h> #endif +#ifndef LINUX +#ifdef HAVE_SYS_FCNTL_H +#include <sys/fcntl.h> +#endif +#endif + #include <stdio.h> #include <dirent.h> #include <errno.h> |