summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-10-05 06:09:44 +0000
committerAndrew Tridgell <tridge@samba.org>1998-10-05 06:09:44 +0000
commit9a98985a65b9324bea3750cee1f363a9d1108663 (patch)
treeb54882fdb3320aa46f367665ebdc96c390272afb
parent4e8b4a20ab3a21c69c03b548709b60267b50af44 (diff)
downloadsamba-9a98985a65b9324bea3750cee1f363a9d1108663.tar.gz
samba-9a98985a65b9324bea3750cee1f363a9d1108663.tar.bz2
samba-9a98985a65b9324bea3750cee1f363a9d1108663.zip
need to use SYS_open64 not _open64 for solaris 2.6 or stdio doesn't
work right. (This used to be commit c185585dd917d6c157460e941e983b5e43d69f7a)
-rw-r--r--source3/smbwrapper/realcalls.h7
-rw-r--r--source3/smbwrapper/wrapped.c12
2 files changed, 13 insertions, 6 deletions
diff --git a/source3/smbwrapper/realcalls.h b/source3/smbwrapper/realcalls.h
index 9a13ab9300..1d65499ae3 100644
--- a/source3/smbwrapper/realcalls.h
+++ b/source3/smbwrapper/realcalls.h
@@ -31,6 +31,7 @@
#define real_link(fn1, fn2) (syscall(SYS_link, (fn1), (fn2)))
#define real_open(fn,flags,mode) (syscall(SYS_open, (fn), (flags), (mode)))
+#define real_open64(fn,flags,mode) (syscall(SYS_open64, (fn), (flags), (mode)))
#ifdef HAVE__OPENDIR
@@ -177,12 +178,6 @@
#endif
-#ifdef HAVE__OPEN64
-#define real_open64(fn,fl,m) (_open64(fn,fl,m))
-#elif HAVE___OPEN64
-#define real_open64(fn,fl,m) (__open64(fn,fl,m))
-#endif
-
#ifdef HAVE__PREAD
#define real_pread(fd,buf,size,ofs) (_pread(fd,buf,size,ofs))
#elif HAVE___PREAD
diff --git a/source3/smbwrapper/wrapped.c b/source3/smbwrapper/wrapped.c
index d0a3842485..81f8162290 100644
--- a/source3/smbwrapper/wrapped.c
+++ b/source3/smbwrapper/wrapped.c
@@ -55,6 +55,18 @@
}
#endif
+#ifdef HAVE__OPEN64
+ int _open64(const char *name, int flags, mode_t mode)
+{
+ return open64(name, flags, mode);
+}
+#elif HAVE___OPEN
+ int __open64(const char *name, int flags, mode_t mode)
+{
+ return open64(name, flags, mode);
+}
+#endif
+
#ifdef HAVE_PREAD
ssize_t pread(int fd, void *buf, size_t size, off_t ofs)
{