yugui	2010-12-02 17:07:08 +0900 (Thu, 02 Dec 2010)

  New Revision: 30042

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

  Log:
    merges r29466 from trunk into ruby_1_9_2.
    --
    * vsnprintf.c (BSD_vfprintf): fix cast.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/version.h
    branches/ruby_1_9_2/vsnprintf.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30041)
+++ ruby_1_9_2/ChangeLog	(revision 30042)
@@ -1,3 +1,7 @@
+Tue Oct 12 23:55:11 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* vsnprintf.c (BSD_vfprintf): fix cast.
+
 Tue Oct 12 18:25:43 2010  NARUSE, Yui  <naruse@r...>
 
 	* io.c (rb_io_ungetc): always see Bignum. On 32bit valid value
Index: ruby_1_9_2/vsnprintf.c
===================================================================
--- ruby_1_9_2/vsnprintf.c	(revision 30041)
+++ ruby_1_9_2/vsnprintf.c	(revision 30042)
@@ -893,7 +893,7 @@
 			 */
 			prec = (int)(sizeof(void*)*CHAR_BIT/4);
 #ifdef _HAVE_LLP64_
-			uqval = (u_long)va_arg(ap, void *);
+			uqval = (u_quad_t)va_arg(ap, void *);
 			flags = (flags) | QUADINT | HEXPREFIX;
 #else
 			ulval = (u_long)va_arg(ap, void *);
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30041)
+++ ruby_1_9_2/version.h	(revision 30042)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 72
+#define RUBY_PATCHLEVEL 73
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

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