summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-13 01:50:32 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-09-13 01:50:32 +0000
commit945124e6a8014d2a3db0d8c4f3957d49de5c624f (patch)
tree0f84e24430aa04fe74ba6b0af39f320bf20109d8
parent45c9283c4ba61dbb7139bc8d6e1f956435401e1a (diff)
downloadruby-945124e6a8014d2a3db0d8c4f3957d49de5c624f.tar.gz
ruby-945124e6a8014d2a3db0d8c4f3957d49de5c624f.tar.xz
ruby-945124e6a8014d2a3db0d8c4f3957d49de5c624f.zip
* win32/win32.c (rb_w32_getpid): don't need to use _getpid() on
mswin32 and mingw32. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6898 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--win32/win32.c6
2 files changed, 6 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 994e5f25b..309dcec66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Sep 13 10:48:37 2004 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * win32/win32.c (rb_w32_getpid): don't need to use _getpid() on
+ mswin32 and mingw32.
+
Mon Sep 13 10:22:05 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* object.c (nil_inspect): fix typo.
diff --git a/win32/win32.c b/win32/win32.c
index a9b1ef2f6..55c807c90 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3300,17 +3300,13 @@ rb_w32_free_environ(char **env)
free(env);
}
+#undef getpid
pid_t
rb_w32_getpid(void)
{
pid_t pid;
-#ifndef __BORLANDC__
- pid = _getpid();
-#else
-#undef getpid
pid = getpid();
-#endif
if (IsWin95()) pid = -pid;