ruby-changes:4284
From: ko1@a...
Date: Fri, 14 Mar 2008 11:35:46 +0900 (JST)
Subject: [ruby-changes:4284] usa - Ruby:r15774 (trunk): * {bcc,win}32/Makefile.sub: follow below changes.
usa 2008-03-14 11:35:24 +0900 (Fri, 14 Mar 2008) New Revision: 15774 Modified files: trunk/ChangeLog trunk/bcc32/Makefile.sub trunk/win32/Makefile.sub Log: * {bcc,win}32/Makefile.sub: follow below changes. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15774&r2=15773&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/win32/Makefile.sub?r1=15774&r2=15773&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bcc32/Makefile.sub?r1=15774&r2=15773&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 15773) +++ ChangeLog (revision 15774) @@ -1,3 +1,7 @@ +Fri Mar 14 11:34:12 2008 NAKAMURA Usaku <usa@r...> + + * {bcc,win}32/Makefile.sub: follow below changes. + Fri Mar 14 11:24:30 2008 Nobuyoshi Nakada <nobu@r...> * misc/ruby-mode.el (ruby-encoding-map, ruby-use-encoding-map): added Index: win32/Makefile.sub =================================================================== --- win32/Makefile.sub (revision 15773) +++ win32/Makefile.sub (revision 15774) @@ -365,7 +365,6 @@ #define rb_pid_t int #define rb_gid_t int #define rb_uid_t int -#define uint32_t unsigned int #define HAVE_STRUCT_STAT_ST_RDEV 1 #define HAVE_ST_RDEV 1 #define int8_t signed char @@ -385,14 +384,6 @@ #define uint64_t unsigned __int64 #define HAVE_INTPTR_T 1 #define HAVE_UINTPTR_T 1 -!if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" -#define intptr_t __int64 -#define uintptr_t unsigned __int64 -!else -#define intptr_t long -#define uintptr_t unsigned long -!endif -#endif #define GETGROUPS_T int #define RETSIGTYPE void !if !defined(WIN32_WCE) Index: bcc32/Makefile.sub =================================================================== --- bcc32/Makefile.sub (revision 15773) +++ bcc32/Makefile.sub (revision 15774) @@ -282,9 +282,25 @@ \#define rb_uid_t uid_t \#define rb_gid_t gid_t \#define rb_pid_t int -\#define uint32_t unsigned int \#define HAVE_STRUCT_STAT_ST_RDEV 1 \#define HAVE_ST_RDEV 1 +\#define int8_t signed char +\#define HAVE_UINT8_T 1 +\#define uint8_t unsigned char +\#define HAVE_INT16_T 1 +\#define int16_t short +\#define HAVE_UINT16_T 1 +\#define uint16_t unsigned short +\#define HAVE_INT32_T 1 +\#define int32_t int +\#define HAVE_UINT32_T 1 +\#define uint32_t unsigned int +\#define HAVE_INT64_T HAVE_LONG_LONG +\#define int64_t __int64 +\#define HAVE_UINT64_T HAVE_LONG_LONG +\#define uint64_t unsigned __int64 +\#define HAVE_INTPTR_T 1 +\#define HAVE_UINTPTR_T 1 \#define GETGROUPS_T int \#define RETSIGTYPE void \#define HAVE_ALLOCA 1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/