diff options
| author | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-24 14:52:25 +0000 |
|---|---|---|
| committer | ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-24 14:52:25 +0000 |
| commit | 39c3bf8e5b5c850475effe6895129de0faf130ab (patch) | |
| tree | b2bb52625700bb754ca51de05e5b25b0c0ff0239 /win32 | |
| parent | 95d0611dd186880cf7471b4b7cddbc61d196c832 (diff) | |
| download | ruby-39c3bf8e5b5c850475effe6895129de0faf130ab.tar.gz ruby-39c3bf8e5b5c850475effe6895129de0faf130ab.tar.xz ruby-39c3bf8e5b5c850475effe6895129de0faf130ab.zip | |
* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
[ruby-dev:25306]
* win32/win32.[ch]: ditto.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@7653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 4 | ||||
| -rw-r--r-- | win32/win32.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/win32/win32.c b/win32/win32.c index 5986ca5ea..28eb4fc73 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3189,11 +3189,13 @@ void rb_w32_free_environ(char **env) free(env); } +#undef getpid pid_t rb_w32_getpid(void) { pid_t pid; - pid = _getpid(); + pid = getpid(); + if (IsWin95()) pid = -pid; return pid; diff --git a/win32/win32.h b/win32/win32.h index 005e335e2..8d3284948 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -107,7 +107,6 @@ extern "C++" { #define mktemp(t) _mktemp(t) #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 |