diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-10-04 23:47:02 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-10-04 23:47:02 +0000 |
| commit | dde4b88a02493b86b9a74fc9685e423d88101fbf (patch) | |
| tree | f603209a994762f6af5c7486a6ad918d097102b4 | |
| parent | 06eaf71e433bf0970e86f2389842637089805346 (diff) | |
| download | samba-dde4b88a02493b86b9a74fc9685e423d88101fbf.tar.gz samba-dde4b88a02493b86b9a74fc9685e423d88101fbf.tar.bz2 samba-dde4b88a02493b86b9a74fc9685e423d88101fbf.zip | |
we need to use __readdir() in preference to SYS_readdir for systems
that use getdents.
(This used to be commit c63ad1b69859653d67d4711b700015860680efff)
| -rw-r--r-- | source3/smbwrapper/realcalls.h | 4 | ||||
| -rw-r--r-- | source3/smbwrapper/wrapped.c | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbwrapper/realcalls.h b/source3/smbwrapper/realcalls.h index 2267d21a73..b55ae3b551 100644 --- a/source3/smbwrapper/realcalls.h +++ b/source3/smbwrapper/realcalls.h @@ -43,10 +43,10 @@ #ifdef HAVE__READDIR #define real_readdir(d) (_readdir(d)) -#elif SYS_readdir -#define real_readdir(d) (syscall(SYS_readdir,(d))) #elif HAVE___READDIR #define real_readdir(d) (__readdir(d)) +#elif SYS_readdir +#define real_readdir(d) (syscall(SYS_readdir,(d))) #endif #ifdef HAVE__CLOSEDIR diff --git a/source3/smbwrapper/wrapped.c b/source3/smbwrapper/wrapped.c index a6e35563da..502a2a9113 100644 --- a/source3/smbwrapper/wrapped.c +++ b/source3/smbwrapper/wrapped.c @@ -544,7 +544,6 @@ __asm__(".globl _write; _write = write"); return real_opendir(name); } - struct dirent *readdir(DIR *dir) { if (smbw_dirp(dir)) { |