diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-05 08:00:50 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-01-05 08:00:50 +0000 |
| commit | 09736c1621ad5cb67ac1b4b21ce2ea6f3761539b (patch) | |
| tree | 43e604ba7d85fdbe4c4568e42adad4202430f1de /win32/win32.h | |
| parent | 5e51e94304a30446108752829639247da23873ca (diff) | |
* parse.y (BITSTACK_POP): workaround for bcc32 compiler's bug.
shift assignment operator '>>=' for __int64 in struct may
generate collapsed code. [ruby-dev:25342]
* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
[ruby-dev:25306]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7729 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.h')
| -rw-r--r-- | win32/win32.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/win32/win32.h b/win32/win32.h index 790d3b8393..916e8ce276 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -105,7 +105,6 @@ extern "C++" { #define eof() _eof() #define filelength(h) _filelength(h) #define mktemp(t) _mktemp(t) -#define perror(s) _perror(s) #define read(h, b, l) _read(h, b, l) #define tell(h) _tell(h) #define unlink(p) _unlink(p) @@ -127,8 +126,10 @@ extern "C++" { #define stat(path,st) rb_w32_stat(path,st) #undef execv #define execv(path,argv) rb_w32_aspawn(P_OVERLAY,path,argv) +#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) #undef isatty #define isatty(h) rb_w32_isatty(h) +#endif #undef mkdir #define mkdir(p, m) rb_w32_mkdir(p, m) @@ -195,7 +196,9 @@ extern int rb_w32_aspawn(int, const char *, char *const *); extern int kill(int, int); extern int fcntl(int, int, ...); extern pid_t rb_w32_getpid(void); +#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) extern int rb_w32_isatty(int); +#endif extern int rb_w32_mkdir(const char *, int); extern int rb_w32_rmdir(const char *); |