summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 03:18:09 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-01-16 03:18:09 +0000
commitf1e87dd9ac46c3d3f7c5101eeaee8a43b2ddaab6 (patch)
tree761634a4fb5760937d7ceb267af2bb70ebeae7aa
parent0be716237d732469f0ff2f77518f9e4153827fd5 (diff)
* 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21590 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog8
-rw-r--r--include/ruby/ruby.h2
-rw-r--r--win32/Makefile.sub4
3 files changed, 13 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ea1330a975..dcddcce51c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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