From bc8c8e90d5be190c33ab67a95d66864127ad3b57 Mon Sep 17 00:00:00 2001 From: usa Date: Fri, 14 Mar 2008 02:35:24 +0000 Subject: [PATCH] * {bcc,win}32/Makefile.sub: follow below changes. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15774 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ bcc32/Makefile.sub | 18 +++++++++++++++++- win32/Makefile.sub | 9 --------- 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 41ed0a1fa4..af7d1ae6f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Mar 14 11:34:12 2008 NAKAMURA Usaku + + * {bcc,win}32/Makefile.sub: follow below changes. + Fri Mar 14 11:24:30 2008 Nobuyoshi Nakada * misc/ruby-mode.el (ruby-encoding-map, ruby-use-encoding-map): added diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index fd6993e08f..b48691e543 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -282,9 +282,25 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub \#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 diff --git a/win32/Makefile.sub b/win32/Makefile.sub index cb06fecbc3..c61812212b 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -365,7 +365,6 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #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 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub #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)