diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-19 12:28:14 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-19 12:28:14 +0000 |
| commit | 224021104d13cbb060cdf87914361503226e4adf (patch) | |
| tree | 031fbe4a5718e95bb0d6e6b9038542c5d6cf7fb9 /win32 | |
| parent | 22c005569b8cd00ea6895dcc7b621b80d9f15068 (diff) | |
| download | ruby-224021104d13cbb060cdf87914361503226e4adf.tar.gz | |
* ext/digest/defs.h, win32/win3.c, win32/win32.h, file.c: remove
useless casts for Borland C.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/dir.h | 5 | ||||
| -rw-r--r-- | win32/win32.c | 11 | ||||
| -rw-r--r-- | win32/win32.h | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/win32/dir.h b/win32/dir.h index 1f1f66649a..e12c6e159c 100644 --- a/win32/dir.h +++ b/win32/dir.h @@ -1,3 +1,6 @@ +#ifndef RUBY_WIN32_DIR_H +#define RUBY_WIN32_DIR_H + #ifdef __BORLANDC__ # ifndef WIN32_DIR_H_ # define WIN32_DIR_H_ @@ -37,3 +40,5 @@ void rb_w32_closedir(DIR *); #define seekdir rb_w32_seekdir #define rewinddir rb_w32_rewinddir #define closedir rb_w32_closedir + +#endif /* RUBY_WIN32_DIR_H */ diff --git a/win32/win32.c b/win32/win32.c index b1b55d34e1..4a6479bfa3 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -583,7 +583,6 @@ isInternalCmd(const char *cmd, const char *interp) return 1; } - SOCKET rb_w32_get_osfhandle(int fh) { @@ -1748,12 +1747,7 @@ setgid(int gid) // int -/* ioctl(int i, unsigned int u, char *data) */ -#ifdef __BORLANDC__ - ioctl(int i, int u, ...) -#else - ioctl(int i, unsigned int u, long data) -#endif +ioctl(int i, int u, ...) { return -1; } @@ -2489,6 +2483,9 @@ rb_w32_getcwd(buffer, size) char *bp; #undef getcwd +#ifndef __BORLANDC__ +#define getcwd _getcwd +#endif if (getcwd(buffer, size) == NULL) { return NULL; } diff --git a/win32/win32.h b/win32/win32.h index 92dd59c169..7122ec9a20 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -57,7 +57,7 @@ extern "C++" { #include <signal.h> #include <sys/stat.h> #include <sys/types.h> -#if !defined(__BORLANDC__) +#ifdef HAVE_SYS_UTIME_H # include <sys/utime.h> #else # include <utime.h> @@ -188,7 +188,7 @@ extern pid_t rb_w32_getpid(void); #endif #endif -#ifdef __BORLANDC__ +#if 0 && defined __BORLANDC__ #undef S_ISDIR #undef S_ISFIFO #undef S_ISBLK @@ -240,9 +240,7 @@ extern pid_t rb_w32_getpid(void); // // stubs // -#if !defined(__BORLANDC__) -extern int ioctl (int, unsigned int, long); -#endif +extern int ioctl (int, int, ...); extern UIDTYPE getuid (void); extern UIDTYPE geteuid (void); extern GIDTYPE getgid (void); |