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 | 6302bcf0227d237a49af37862c335891222af339 (patch) | |
| tree | c2e2c1d38cb65d206d6a67c02a5abcb3ee00cf70 | |
| parent | ed1a776ae06b9b11ae7fe86c94f3a76dae969b41 (diff) | |
* 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: svn+ssh://ci.ruby-lang.org/ruby/trunk@6880 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 4 | ||||
| -rw-r--r-- | win32/win32.c | 6 | ||||
| -rw-r--r-- | win32/win32.h | 1 |
4 files changed, 15 insertions, 3 deletions
@@ -1,3 +1,10 @@ +Fri Sep 10 19:16:24 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * bcc32/Makefile.sub: bccwin32 port starts to use RTL dll. + (need to rebuild all) [ruby-dev:24138] + + * win32/win32.{h,c}: ditto. + Fri Sep 10 15:55:59 2004 Minero Aoki <aamine@loveruby.net> * lib/fileutils.rb (mkdir_p): should pass mode argument to diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index be73f5ed45..b0739aa91d 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -114,7 +114,7 @@ RDOCTARGET = install-doc OUTFLAG = -o !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 @@ -128,7 +128,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 7c5e283356..a9b1ef2f64 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 b2ad2a33ea..0a8f6d5257 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 |