summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-10-05 12:43:05 +0000
committerAndrew Tridgell <tridge@samba.org>1998-10-05 12:43:05 +0000
commit4473ce561b32be514bf62bf46379558f4127916f (patch)
tree4f486eb276ad65eedba02a9cba459b7bb3854ac3
parent217804ba43bad984e1d1c8a623acea95ed929a4e (diff)
downloadsamba-4473ce561b32be514bf62bf46379558f4127916f.tar.gz
samba-4473ce561b32be514bf62bf46379558f4127916f.tar.bz2
samba-4473ce561b32be514bf62bf46379558f4127916f.zip
- keep IRIX cc -64 happy
- fixed a chdir bug (This used to be commit 80d1c5118abaa99fe0f1c9d2089a81c9953cebad)
-rw-r--r--source3/smbwrapper/realcalls.h20
-rw-r--r--source3/smbwrapper/smbw_dir.c2
-rw-r--r--source3/smbwrapper/smbw_stat.c2
3 files changed, 12 insertions, 12 deletions
diff --git a/source3/smbwrapper/realcalls.h b/source3/smbwrapper/realcalls.h
index afd69b2d0c..338e195087 100644
--- a/source3/smbwrapper/realcalls.h
+++ b/source3/smbwrapper/realcalls.h
@@ -52,19 +52,19 @@
#endif
#ifdef HAVE__OPENDIR
-#define real_opendir(fn) (_opendir(fn))
+#define real_opendir(fn) ((DIR *)_opendir(fn))
#elif SYS_opendir
#define real_opendir(fn) ((DIR *)syscall(SYS_opendir,(fn)))
#elif HAVE___OPENDIR
-#define real_opendir(fn) (__opendir(fn))
+#define real_opendir(fn) ((DIR *)__opendir(fn))
#endif
#ifdef HAVE__READDIR
-#define real_readdir(d) (_readdir(d))
+#define real_readdir(d) ((struct dirent *)_readdir(d))
#elif HAVE___READDIR
-#define real_readdir(d) (__readdir(d))
+#define real_readdir(d) ((struct dirent *)__readdir(d))
#elif SYS_readdir
-#define real_readdir(d) (syscall(SYS_readdir,(d)))
+#define real_readdir(d) ((struct dirent *)syscall(SYS_readdir,(d)))
#endif
#ifdef HAVE__CLOSEDIR
@@ -110,11 +110,11 @@
#endif
#ifdef HAVE__GETCWD
-#define real_getcwd(b,s) (_getcwd(b,s))
+#define real_getcwd(b,s) ((char *)_getcwd(b,s))
#elif SYS_getcwd
-#define real_getcwd(b,s) (syscall(SYS_getcwd,(b),(s)))
+#define real_getcwd(b,s) ((char *)syscall(SYS_getcwd,(b),(s)))
#elif HAVE___GETCWD
-#define real_getcwd(b,s) (__getcwd(b,s))
+#define real_getcwd(b,s) ((char *)__getcwd(b,s))
#endif
#ifdef HAVE__STAT
@@ -181,9 +181,9 @@
#endif
#ifdef HAVE__READDIR64
-#define real_readdir64(d) (_readdir64(d))
+#define real_readdir64(d) ((struct dirent64 *)_readdir64(d))
#elif HAVE___READDIR64
-#define real_readdir64(d) (__readdir64(d))
+#define real_readdir64(d) ((struct dirent64 *)__readdir64(d))
#endif
#ifdef HAVE__LLSEEK
diff --git a/source3/smbwrapper/smbw_dir.c b/source3/smbwrapper/smbw_dir.c
index 39fe034e7b..c21c9b4983 100644
--- a/source3/smbwrapper/smbw_dir.c
+++ b/source3/smbwrapper/smbw_dir.c
@@ -353,7 +353,7 @@ int smbw_chdir(const char *name)
smbw_init();
- if (smbw_busy) return real_chdir(cwd);
+ if (smbw_busy) return real_chdir(name);
smbw_busy++;
diff --git a/source3/smbwrapper/smbw_stat.c b/source3/smbwrapper/smbw_stat.c
index f4d92321bb..ab351d56b1 100644
--- a/source3/smbwrapper/smbw_stat.c
+++ b/source3/smbwrapper/smbw_stat.c
@@ -117,7 +117,7 @@ int smbw_fstat(int fd, struct stat *st)
{
struct smbw_file *file;
time_t c_time, a_time, m_time;
- uint32 size;
+ size_t size;
uint32 mode;
smbw_busy++;