diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | include/ruby/ruby.h | 2 | ||||
| -rw-r--r-- | win32/Makefile.sub | 4 |
3 files changed, 13 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Fri Jan 16 12:15:07 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * include/ruby/ruby.h (PRI_PTRDIFF_PREFIX): must define as string. + if not, cause compile error in using PRI?VALUE. + + * win32/Makefile.sub (config.h): add SIZEOF_INTPTR_T and + SIZEOF_UINTPTR_T for SIZEOF_VALUE. + Fri Jan 16 11:51:20 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * symbian/pre-build (COMSPEC): should not overridden. diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index fc5326ff1c..29f27a51aa 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -85,7 +85,7 @@ typedef uintptr_t VALUE; typedef uintptr_t ID; # define SIGNED_VALUE intptr_t # define SIZEOF_VALUE SIZEOF_UINTPTR_T -# undef PRI_VALUE_PREFIX +# define PRI_VALUE_PREFIX "" #elif SIZEOF_LONG == SIZEOF_VOIDP typedef unsigned long VALUE; typedef unsigned long ID; diff --git a/win32/Makefile.sub b/win32/Makefile.sub index f76e2a7e45..dc2baf6483 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -358,9 +358,13 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub $(win_srcdir)/Makefile.sub !if "$(ARCH)" == "x64" || "$(ARCH)" == "ia64" #define SIZEOF_SIZE_T 8 #define SIZEOF_PTRDIFF_T 8 +#define SIZEOF_INTPTR_T 8 +#define SIZEOF_UINTPTR_T 8 !else #define SIZEOF_SIZE_T 4 #define SIZEOF_PTRDIFF_T 4 +#define SIZEOF_INTPTR_T 4 +#define SIZEOF_UINTPTR_T 4 !endif !if $(MSC_VER) < 1400 #define SIZE_MAX UINT_MAX |