nobu	2008-05-20 11:36:09 +0900 (Tue, 20 May 2008)

  New Revision: 16487

  Modified files:
    trunk/ChangeLog
    trunk/gc.c
    trunk/include/ruby/ruby.h

  Log:
    * include/ruby/ruby.h (PRI[diouxX]VALUE): printf format for VALUE.
    
    * gc.c (assign_heap_slot): suppress a warning.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/ruby.h?r1=16487&r2=16486&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16487&r2=16486&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/gc.c?r1=16487&r2=16486&diff_format=u

Index: include/ruby/ruby.h
===================================================================
--- include/ruby/ruby.h	(revision 16486)
+++ include/ruby/ruby.h	(revision 16487)
@@ -85,12 +85,24 @@
 typedef unsigned long ID;
 # define SIGNED_VALUE long
 # define SIZEOF_VALUE SIZEOF_LONG
+# define PRIdVALUE "ld"
+# define PRIiVALUE "li"
+# define PRIoVALUE "lo"
+# define PRIuVALUE "lu"
+# define PRIxVALUE "lx"
+# define PRIXVALUE "lX"
 #elif SIZEOF_LONG_LONG == SIZEOF_VOIDP
 typedef unsigned LONG_LONG VALUE;
 typedef unsigned LONG_LONG ID;
 # define SIGNED_VALUE LONG_LONG
 # define LONG_LONG_VALUE 1
 # define SIZEOF_VALUE SIZEOF_LONG_LONG
+# define PRIdVALUE "lld"
+# define PRIiVALUE "lli"
+# define PRIoVALUE "llo"
+# define PRIuVALUE "llu"
+# define PRIxVALUE "llx"
+# define PRIXVALUE "llX"
 #else
 # error ---->> ruby requires sizeof(void*) == sizeof(long) to be compiled. <<----
 #endif
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16486)
+++ ChangeLog	(revision 16487)
@@ -1,3 +1,9 @@
+Tue May 20 11:36:06 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* include/ruby/ruby.h (PRI[diouxX]VALUE): printf format for VALUE.
+
+	* gc.c (assign_heap_slot): suppress a warning.
+
 Tue May 20 03:42:43 2008  Koichi Sasada  <ko1@a...>
 
 	* eval.c, vm_insnhelper.c: fix cref in instance_eval
Index: gc.c
===================================================================
--- gc.c	(revision 16486)
+++ gc.c	(revision 16487)
@@ -570,7 +570,7 @@
 	    hi = mid;
 	}
 	else {
-	    rb_bug("same heap slot is allocated: %p at %ld", membase, mid);
+	    rb_bug("same heap slot is allocated: %p at %"PRIuVALUE, membase, (VALUE)mid);
 	}
     }
     if (hi < heaps_used) {

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