mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* 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
This commit is contained in:
parent
3d35bc31f4
commit
f4960beffe
4 changed files with 13 additions and 4 deletions
|
|
@ -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>
|
Fri Dec 24 23:27:18 2004 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
|
||||||
|
|
||||||
* ext/tk/lib/tk/image.rb: TkPhotoImage#cget bug fix
|
* 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>
|
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)
|
* 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>
|
Fri Dec 24 02:52:52 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -95,7 +95,7 @@ libdir = $(exec_prefix)/lib
|
||||||
DESTDIR = $(prefix)
|
DESTDIR = $(prefix)
|
||||||
!endif
|
!endif
|
||||||
!ifndef CFLAGS
|
!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
|
!endif
|
||||||
!ifndef CPPFLAGS
|
!ifndef CPPFLAGS
|
||||||
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
|
CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)missing
|
||||||
|
|
@ -109,7 +109,7 @@ RFLAGS = $(iconinc)
|
||||||
!ifndef EXTLIBS
|
!ifndef EXTLIBS
|
||||||
EXTLIBS =
|
EXTLIBS =
|
||||||
!endif
|
!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
|
MISSING = acosh.obj crypt.obj erf.obj win32.obj
|
||||||
|
|
||||||
!ifndef STACK
|
!ifndef STACK
|
||||||
|
|
|
||||||
|
|
@ -3189,11 +3189,13 @@ void rb_w32_free_environ(char **env)
|
||||||
free(env);
|
free(env);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#undef getpid
|
||||||
pid_t rb_w32_getpid(void)
|
pid_t rb_w32_getpid(void)
|
||||||
{
|
{
|
||||||
pid_t pid;
|
pid_t pid;
|
||||||
|
|
||||||
pid = _getpid();
|
pid = getpid();
|
||||||
|
|
||||||
if (IsWin95()) pid = -pid;
|
if (IsWin95()) pid = -pid;
|
||||||
|
|
||||||
return pid;
|
return pid;
|
||||||
|
|
|
||||||
|
|
@ -107,7 +107,6 @@ extern "C++" {
|
||||||
#define mktemp(t) _mktemp(t)
|
#define mktemp(t) _mktemp(t)
|
||||||
#define read(h, b, l) _read(h, b, l)
|
#define read(h, b, l) _read(h, b, l)
|
||||||
#define tell(h) _tell(h)
|
#define tell(h) _tell(h)
|
||||||
#define umask(m) _umask(m)
|
|
||||||
#define unlink(p) _unlink(p)
|
#define unlink(p) _unlink(p)
|
||||||
#define write(h, b, l) _write(h, b, l)
|
#define write(h, b, l) _write(h, b, l)
|
||||||
#define _open _sopen
|
#define _open _sopen
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue