drat. We can't include sys/fcntl.h because that gives

conflicts. Instead use "01101" for O_CREAT|O_WRONLY|O_TRUNC.

uggh.
(This used to be commit cfc06af0b770d6638ba131501f9ea5a5c28cec3b)

diff --git a/source3/smbwrapper/wrapped.c b/source3/smbwrapper/wrapped.c
index 8aa3768638db7b0d7a51af0a3580a88cb5089870..a6e35563da600b388019520beeab0b1745d4c6d0 100644 (file)
--- a/source3/smbwrapper/wrapped.c
+++ b/source3/smbwrapper/wrapped.c
@@ -625,5 +625,6 @@ __asm__(".globl _write; _write = write");
 
  int creat(const char *path, mode_t mode)
 {
-       return open(path, O_WRONLY | O_CREAT | O_TRUNC, mode);
+       /* drat, including sys/fcntl.h gives conflicts */
+       return open(path, 01101, mode);
 }

diff --git a/source3/smbwrapper/wrapper.h b/source3/smbwrapper/wrapper.h
index 95f68d7ef99a2c5e496de2bc23194fbdcb151d6e..fec400a724109cca7ab38a2369b88bfad68b6e2e 100644 (file)
--- a/source3/smbwrapper/wrapper.h
+++ b/source3/smbwrapper/wrapper.h
@@ -34,7 +34,6 @@
 #include <stdio.h>
 #include <dirent.h>
 #include <errno.h>
-#include <sys/fcntl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/time.h>