nobu	2009-01-16 18:31:05 +0900 (Fri, 16 Jan 2009)

  New Revision: 21605

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21605

  Log:
    * include/ruby/ruby.h (VALUE): use unsigned long or long long
      instead of uintptr_t, since many %lx and so on are still used.

  Modified files:
    trunk/include/ruby/ruby.h

Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 21604)
+++ include/ruby/ruby.h	(revision 21605)
@@ -80,12 +80,12 @@
 #  endif
 #endif
 
-#if defined HAVE_UINTPTR_T
+#if defined HAVE_UINTPTR_T && 0
 typedef uintptr_t VALUE;
 typedef uintptr_t ID;
 # define SIGNED_VALUE intptr_t
 # define SIZEOF_VALUE SIZEOF_UINTPTR_T
-# define PRI_VALUE_PREFIX ""
+# undef PRI_VALUE_PREFIX
 #elif SIZEOF_LONG == SIZEOF_VOIDP
 typedef unsigned long VALUE;
 typedef unsigned long ID;
@@ -103,7 +103,7 @@
 # error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
 #endif
 
-#ifdef PRIdPTR
+#if defined PRIdPTR && !defined PRI_VALUE_PREFIX
 #define PRIdVALUE PRIdPTR
 #define PRIiVALUE PRIiPTR
 #define PRIoVALUE PRIoPTR
@@ -118,6 +118,9 @@
 #define PRIxVALUE PRI_VALUE_PREFIX"x"
 #define PRIXVALUE PRI_VALUE_PREFIX"X"
 #endif
+#ifndef PRI_VALUE_PREFIX
+# define PRI_VALUE_PREFIX ""
+#endif
 
 #if defined PRIdPTR
 # define PRI_PTRDIFF_PREFIX "t"

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/