From f4960beffe46f4da67fc529c1c8d845fd3b6bef1 Mon Sep 17 00:00:00 2001
From: ocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 24 Dec 2004 14:52:25 +0000
Subject: * bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)  
 [ruby-dev:25306]

* win32/win32.[ch]: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7653 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 win32/win32.c | 4 +++-
 win32/win32.h | 1 -
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'win32')

diff --git a/win32/win32.c b/win32/win32.c
index 5986ca5ea7..28eb4fc737 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 005e335e21..8d3284948b 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
-- 
cgit v1.2.3