ruby-changes:4384
From: ko1@a...
Date: Tue, 1 Apr 2008 09:42:23 +0900 (JST)
Subject: [ruby-changes:4384] usa - Ruby:r15875 (trunk): * {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc.
usa 2008-04-01 09:42:06 +0900 (Tue, 01 Apr 2008) New Revision: 15875 Modified files: trunk/ChangeLog trunk/bcc32/Makefile.sub trunk/win32/Makefile.sub Log: * {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15875&r2=15874&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=15875&r2=15874&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=15875&r2=15874&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 15874) +++ ChangeLog (revision 15875) @@ -1,3 +1,7 @@ +Tue Apr 1 09:41:22 2008 NAKAMURA Usaku <usa@r...> + + * {bcc,win}32/Makefile (config.h): need to define RUBY_SETJMP, etc. + Tue Apr 1 07:31:58 2008 Eric Hodel <drbrain@s...> * lib/rubygems* test/rubygems*: Import RubyGems 1.1.0. Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 15874) +++ win32/Makefile.sub (revision 15875) @@ -385,7 +385,7 @@ #define HAVE_INTPTR_T 1 #define HAVE_UINTPTR_T 1 #define HAVE_SSIZE_T 1 -!if "$(ARCH)" == "AMD64" || "$(ARCH)" == "IA64" +!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" #define ssize_t __int64 !else #define ssize_t int @@ -442,6 +442,9 @@ #define RSHIFT(x,y) ((x)>>(int)y) #define FILE_COUNT _cnt #define FILE_READPTR _ptr +#define RUBY_SETJMP(env) _setjmp(env) +#define RUBY_LONGJMP(env,val) longjmp(env,val) +#define RUBY_JMP_BUF jmp_buf #define inline __inline #define NEED_IO_SEEK_BETWEEN_RW 1 !if "$(PROCESSOR_ARCHITECTURE)" == "x86" || "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" Index: bcc32/Makefile.sub =================================================================== --- bcc32/Makefile.sub (revision 15874) +++ bcc32/Makefile.sub (revision 15875) @@ -342,6 +342,9 @@ \#define RSHIFT(x,y) ((x)>>(int)y) \#define FILE_COUNT level \#define FILE_READPTR curp +\#define RUBY_SETJMP(env) _setjmp(env) +\#define RUBY_LONGJMP(env,val) longjmp(env,val) +\#define RUBY_JMP_BUF jmp_buf \#define inline __inline \#define NEED_IO_SEEK_BETWEEN_RW 1 \#define STACK_GROW_DIRECTION -1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/