diff options
| author | Andrew Tridgell <tridge@samba.org> | 1998-10-03 16:40:32 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 1998-10-03 16:40:32 +0000 |
| commit | a4a0c71e4f3913d56fd87754081da18bd353b9e8 (patch) | |
| tree | f3028713ce33e15099476acb64491e573f3fa6e5 /source3 | |
| parent | 1fa3478aaf5a40a0eb37f8f5679707d23231e276 (diff) | |
| download | samba-a4a0c71e4f3913d56fd87754081da18bd353b9e8.tar.gz samba-a4a0c71e4f3913d56fd87754081da18bd353b9e8.tar.bz2 samba-a4a0c71e4f3913d56fd87754081da18bd353b9e8.zip | |
use __XXXdir() instead of __libc_XXXdir()
(This used to be commit e28f55c0a3386cdb0185f5252b54d10d2c2a1710)
Diffstat (limited to 'source3')
| -rw-r--r-- | source3/smbwrapper/closedir.c | 4 | ||||
| -rw-r--r-- | source3/smbwrapper/opendir.c | 4 | ||||
| -rw-r--r-- | source3/smbwrapper/readdir.c | 4 | ||||
| -rw-r--r-- | source3/smbwrapper/realcalls.h | 11 | ||||
| -rw-r--r-- | source3/smbwrapper/seekdir.c | 4 | ||||
| -rw-r--r-- | source3/smbwrapper/telldir.c | 4 |
6 files changed, 5 insertions, 26 deletions
diff --git a/source3/smbwrapper/closedir.c b/source3/smbwrapper/closedir.c index 8e487abe47..23b747ebf7 100644 --- a/source3/smbwrapper/closedir.c +++ b/source3/smbwrapper/closedir.c @@ -22,10 +22,6 @@ #include "wrapper.h" -#ifdef linux -__asm__(".globl __closedir; __closedir = closedir"); -#endif - int closedir(DIR *dir) { if (smbw_dirp(dir)) { diff --git a/source3/smbwrapper/opendir.c b/source3/smbwrapper/opendir.c index 2dfb3dbf21..87c465a777 100644 --- a/source3/smbwrapper/opendir.c +++ b/source3/smbwrapper/opendir.c @@ -22,10 +22,6 @@ #include "wrapper.h" -#ifdef linux -__asm__(".globl __opendir; __opendir = opendir"); -#endif - DIR *opendir(const char *name) { if (smbw_path(name)) { diff --git a/source3/smbwrapper/readdir.c b/source3/smbwrapper/readdir.c index f232a2609e..044262b9f2 100644 --- a/source3/smbwrapper/readdir.c +++ b/source3/smbwrapper/readdir.c @@ -22,10 +22,6 @@ #include "wrapper.h" -#ifdef linux -__asm__(".globl __readdir; __readdir = readdir"); -#endif - struct dirent *readdir(DIR *dir) { if (smbw_dirp(dir)) { diff --git a/source3/smbwrapper/realcalls.h b/source3/smbwrapper/realcalls.h index a5eb046962..0b0a9f39cb 100644 --- a/source3/smbwrapper/realcalls.h +++ b/source3/smbwrapper/realcalls.h @@ -20,12 +20,11 @@ #define real_prev_stat(fn, buf ) (syscall(SYS_prev_stat, (fn), (buf))) #ifdef linux -struct dirent *__libc_readdir(DIR * dir); -#define real_readdir(dir) (__libc_readdir(dir)) -#define real_opendir(fn) (__libc_opendir(fn)) -#define real_telldir(dir) (__libc_telldir(dir)) -#define real_closedir(dir) (__libc_closedir(dir)) -#define real_seekdir(dir, ofs) (__libc_seekdir(dir, ofs)) +#define real_readdir(dir) (__readdir(dir)) +#define real_opendir(fn) (__opendir(fn)) +#define real_telldir(dir) (__telldir(dir)) +#define real_closedir(dir) (__closedir(dir)) +#define real_seekdir(dir, ofs) (__seekdir(dir, ofs)) #else #define real_readdir(dirp) ((struct dirent *)syscall(SYS_readdir,(dirp))) #define real_opendir(fn) ((DIR *)syscall(SYS_opendir,(fn))) diff --git a/source3/smbwrapper/seekdir.c b/source3/smbwrapper/seekdir.c index b30b8b899c..c84aaf4caa 100644 --- a/source3/smbwrapper/seekdir.c +++ b/source3/smbwrapper/seekdir.c @@ -22,10 +22,6 @@ #include "wrapper.h" -#ifdef linux -__asm__(".globl __seekdir; __seekdir = seekdir"); -#endif - void seekdir(DIR *dir, off_t offset) { if (smbw_dirp(dir)) { diff --git a/source3/smbwrapper/telldir.c b/source3/smbwrapper/telldir.c index d8bd3572a2..13c1133c72 100644 --- a/source3/smbwrapper/telldir.c +++ b/source3/smbwrapper/telldir.c @@ -22,10 +22,6 @@ #include "wrapper.h" -#ifdef linux -__asm__(".globl __telldir; __telldir = telldir"); -#endif - off_t telldir(DIR *dir) { if (smbw_dirp(dir)) { |