diff options
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 2 | ||||
| -rw-r--r-- | win32/win32.h | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c index f44b805ae6..5986ca5ea7 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3322,6 +3322,7 @@ rb_w32_snprintf(char *buf, size_t size, const char *format, ...) return ret; } +#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) int rb_w32_isatty(int fd) { @@ -3335,6 +3336,7 @@ rb_w32_isatty(int fd) } return 1; } +#endif // // Fix bcc32's stdio bug diff --git a/win32/win32.h b/win32/win32.h index a7995a083b..005e335e21 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 umask(m) _umask(m) @@ -125,8 +124,10 @@ extern "C++" { #define stat(path,st) rb_w32_stat(path,st) #undef execv #define execv(path,argv) do_aspawn(P_OVERLAY,path,argv) +#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) #undef isatty #define isatty(h) rb_w32_isatty(h) +#endif #ifdef __MINGW32__ struct timezone { @@ -183,7 +184,10 @@ extern int do_spawn(int, char *); extern int do_aspawn(int, char *, char **); extern int kill(int, int); extern pid_t rb_w32_getpid(void); + +#if !defined(__BORLANDC__) && !defined(_WIN32_WCE) extern int rb_w32_isatty(int); +#endif #ifdef __BORLANDC__ extern FILE *rb_w32_fopen(const char *, const char *); |