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
---
 ChangeLog          | 8 ++++++++
 bcc32/Makefile.sub | 4 ++--
 win32/win32.c      | 4 +++-
 win32/win32.h      | 1 -
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 823757a301..5929e7ac56 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Dec 24 23:51:48 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
+
+	* bcc32/Makefile.sub: bcc32 should use RTL dll (backport from HEAD)
+	  [ruby-dev:25306]
+
+	* win32/win32.[ch]: ditto.
+
 Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 
 	* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
@@ -5,6 +12,7 @@ Fri Dec 24 23:27:18 2004  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 Fri Dec 24 18:39:25 2004  Hirokazu Yamamoto  <ocean@m2.ccsnet.ne.jp>
 
 	* win32/win32.[ch]: failed to compile on bcc32 (and probably wince)
+	  [ruby-dev:25306]
 
 Fri Dec 24 02:52:52 2004  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub
index d04c649fa5..6d87bd4304 100644
--- a/bcc32/Makefile.sub
+++ b/bcc32/Makefile.sub
@@ -95,7 +95,7 @@ libdir = $(exec_prefix)/lib
 DESTDIR = $(prefix)
 !endif
 !ifndef CFLAGS
-CFLAGS = -q $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
+CFLAGS = -q -tWR -tWC $(DEBUGFLAGS) $(OPTFLAGS) $(PROCESSOR_FLAG) -w- -wsus -wcpt -wdup -wext -wrng -wrpt -wzdi
 !endif
 !ifndef CPPFLAGS
 CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
@@ -109,7 +109,7 @@ RFLAGS = $(iconinc)
 !ifndef EXTLIBS
 EXTLIBS =
 !endif
-LIBS = cw32.lib import32.lib ws2_32.lib $(EXTLIBS)
+LIBS = cw32i.lib import32.lib ws2_32.lib $(EXTLIBS)
 MISSING = acosh.obj crypt.obj erf.obj win32.obj
 
 !ifndef STACK
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