diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-04 18:17:30 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-01-04 18:17:30 +0000 |
commit | b369eea79f5ef06a8b314e5ef3a25a0db36db410 (patch) | |
tree | 58de3c1b8ae13b2a2fc07f00c015c90a308ccd86 /win32/win32.h | |
parent | d80285a9fe71b2e5474c66614d48ad03f0d17d6b (diff) | |
download | ruby-b369eea79f5ef06a8b314e5ef3a25a0db36db410.tar.gz |
* file.c (utimbuf): use utimbuf instead of _utimbuf if defined _WIN32.
* win32/Makefile.sub (LIBS): use oldnames.lib.
* win32/win32.c (rb_w32_getcwd): follow above change.
* win32/win32.h: ditto.
* wince/direct.c, wince/direct.h (getcwd): ditto.
* wince/io.h: ditto.
* wince/string.c, wince/wince.h (stricmp, strnicmp): ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3284 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32/win32.h')
-rw-r--r-- | win32/win32.h | 40 |
1 files changed, 5 insertions, 35 deletions
diff --git a/win32/win32.h b/win32/win32.h index 7cdf0a6319..0b7754b350 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -98,46 +98,17 @@ extern "C++" { #define fgetchar() getchar() #define fputchar(_c) putchar(_c) -#ifndef __BORLANDC__ - -#define access _access -#define chmod _chmod -#define chsize _chsize -#define dup _dup -#define dup2 _dup2 -#define isatty _isatty -#define open _open -#define setmode _setmode -#define execl _execl -#define execle _execle -#define execlp _execlp -#define execlpe _execlpe -#define execv _execv -#define execve _execve -#define execvp _execvp -#define execvpe _execvpe -#define lseek _lseek -#define spawnl _spawnl -#define spawnle _spawnle -#define spawnlp _spawnlp -#define spawnlpe _spawnlpe -#define spawnv _spawnv -#define spawnve _spawnve -#define spawnvp _spawnvp -#define spawnvpe _spawnvpe -#if _MSC_VER < 800 -#define fileno _fileno -#endif -#define strcasecmp _stricmp -#define strncasecmp _strnicmp -#else #define strcasecmp stricmp #define strncasecmp strnicmp +#ifdef __BORLANDC__ #define _open _sopen #endif #define close rb_w32_close #define fclose rb_w32_fclose +#define getpid rb_w32_getpid +#define sleep(x) rb_w32_sleep((x)*1000) +#ifdef __BORLANDC__ #define creat _creat #define eof _eof #define filelength _filelength @@ -150,9 +121,8 @@ extern "C++" { #define umask _umask #define unlink _unlink #define write _write -#define getpid rb_w32_getpid -#define sleep(x) rb_w32_sleep((x)*1000) #define utime _utime +#endif #define vsnprintf _vsnprintf #define snprintf _snprintf #undef stat |