From ef4c1e6cb096d916d42957deebdda06b10d9a70b Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 16 Jan 2009 09:31:05 +0000
Subject: * include/ruby/ruby.h (VALUE): use unsigned long or long long  
 instead of uintptr_t, since many %lx and so on are still used.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@21605 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/ruby.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'include/ruby')

diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h
index 29f27a51a..b88737838 100644
--- a/include/ruby/ruby.h
+++ b/include/ruby/ruby.h
@@ -80,12 +80,12 @@ extern "C" {
 #  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 @@ typedef unsigned LONG_LONG ID;
 # 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 @@ typedef unsigned LONG_LONG ID;
 #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"
-- 
cgit