summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad Smith <brad@comstyle.com>2011-10-12 04:23:58 -0400
committerGünther Deschner <gd@samba.org>2011-10-14 17:52:36 +0200
commitd810ada39c584fd2a543f41fb3a121520ab0764e (patch)
tree6cc8856851b658747bb3bdf9a4c8b64e75e8fd31
parent6af702bdc9ea36a1f33232a818a819afde9bc4d2 (diff)
downloadsamba-d810ada39c584fd2a543f41fb3a121520ab0764e.tar.gz
samba-d810ada39c584fd2a543f41fb3a121520ab0764e.tar.bz2
samba-d810ada39c584fd2a543f41fb3a121520ab0764e.zip
Fix sys_fseek wrapper
Signed-off-by: Günther Deschner <gd@samba.org>
-rw-r--r--source3/configure.in2
-rw-r--r--source3/lib/system.c2
-rw-r--r--source3/wscript4
3 files changed, 5 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in
index 7405cfddf7..7780603f8f 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1085,7 +1085,7 @@ AC_CHECK_FUNCS(getgrset)
AC_CHECK_FUNCS(setpriv setgidx setuidx setgroups sysconf stat64 fstat64)
AC_CHECK_FUNCS(lstat64 fopen64 atexit grantpt lseek64 ftruncate64 posix_fallocate posix_fallocate64)
AC_CHECK_FUNCS(fallocate fallocate64)
-AC_CHECK_FUNCS(fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
+AC_CHECK_FUNCS(fseeko fseek64 fseeko64 ftell64 ftello64 setluid getpwanam)
AC_CHECK_FUNCS(opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64)
AC_CHECK_FUNCS(fdopendir fdopendir64)
AC_CHECK_FUNCS(getpwent_r)
diff --git a/source3/lib/system.c b/source3/lib/system.c
index 0aefd6d929..45fe77e344 100644
--- a/source3/lib/system.c
+++ b/source3/lib/system.c
@@ -734,6 +734,8 @@ int sys_fseek(FILE *fp, SMB_OFF_T offset, int whence)
return fseek64(fp, offset, whence);
#elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(LARGE_SMB_OFF_T) && defined(HAVE_FSEEKO64)
return fseeko64(fp, offset, whence);
+#elif defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(LARGE_SMB_OFF_T) && defined(HAVE_FSEEKO)
+ return fseeko(fp, offset, whence);
#else
return fseek(fp, offset, whence);
#endif
diff --git a/source3/wscript b/source3/wscript
index 82434a5574..671785230c 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -82,7 +82,7 @@ def configure(conf):
conf.CHECK_FUNCS('initgroups select poll rdchk getgrnam getgrent pathconf')
conf.CHECK_FUNCS('setpriv setgidx setuidx setgroups sysconf stat64 fstat64')
conf.CHECK_FUNCS('lstat64 fopen64 atexit grantpt lseek64 ftruncate64 fallocate fallocate64 posix_fallocate posix_fallocate64')
- conf.CHECK_FUNCS('fseek64 fseeko64 ftell64 ftello64 setluid')
+ conf.CHECK_FUNCS('fseeko fseek64 fseeko64 ftell64 ftello64 setluid')
conf.CHECK_FUNCS('getpwnam', headers='sys/types.h pwd.h')
conf.CHECK_FUNCS('opendir64 readdir64 seekdir64 telldir64 rewinddir64 closedir64')
conf.CHECK_FUNCS('fdopendir fdopendir64')
@@ -234,7 +234,7 @@ extattr_get_link extattr_list_fd extattr_list_file extattr_list_link
extattr_set_fd extattr_set_file extattr_set_link _facl __facl _fchdir
__fchdir fchmod fchown _fcntl __fcntl fcvt fcvtl fdatasync
fdelproplist fgetea fgetproplist fgetxattr flistea flistxattr fopen64
-_fork __fork fremoveea fremovexattr fseek64 fseeko64 fsetea
+_fork __fork fremoveea fremovexattr fseeko fseek64 fseeko64 fsetea
fsetproplist fsetxattr _fstat __fstat fstat64 _fstat64 __fstat64 fsync
ftell64 ftello64 ftruncate64 futimens futimes __fxstat getauthuid
getcwd _getcwd __getcwd getdents __getdents getdents64 getdirentries