diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-10 10:24:08 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-10 10:24:08 +0000 |
| commit | e89753359ff207d01ce52f471d3aa23769778ae4 (patch) | |
| tree | c2e2c1d38cb65d206d6a67c02a5abcb3ee00cf70 /win32 | |
| parent | f9ab19a0b015e7916c1fa15aa08c004d59a1ba83 (diff) | |
| download | ruby-e89753359ff207d01ce52f471d3aa23769778ae4.tar.gz ruby-e89753359ff207d01ce52f471d3aa23769778ae4.tar.xz ruby-e89753359ff207d01ce52f471d3aa23769778ae4.zip | |
* bcc32/Makefile.sub: bccwin32 port starts to use RTL dll.
(need to rebuild all) [ruby-dev:24138]
* win32/win32.{h,c}: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 6 | ||||
| -rw-r--r-- | win32/win32.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/win32/win32.c b/win32/win32.c index 7c5e28335..a9b1ef2f6 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3305,7 +3305,13 @@ rb_w32_getpid(void) { pid_t pid; +#ifndef __BORLANDC__ pid = _getpid(); +#else +#undef getpid + pid = getpid(); +#endif + if (IsWin95()) pid = -pid; return pid; diff --git a/win32/win32.h b/win32/win32.h index b2ad2a33e..0a8f6d525 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -108,7 +108,6 @@ extern "C++" { #define perror(s) _perror(s) #define read(h, b, l) _read(h, b, l) #define tell(h) _tell(h) -#define umask(m) _umask(m) #define unlink(p) _unlink(p) #define write(h, b, l) _write(h, b, l) #define _open _sopen |