yugui	2009-01-04 15:15:49 +0900 (Sun, 04 Jan 2009)

  New Revision: 21306

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

  Log:
    merges r21227 from trunk into ruby_1_9_1.
    * include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/include/ruby/missing.h
    branches/ruby_1_9_1/sprintf.c

Index: ruby_1_9_1/include/ruby/missing.h
===================================================================
--- ruby_1_9_1/include/ruby/missing.h	(revision 21305)
+++ ruby_1_9_1/include/ruby/missing.h	(revision 21306)
@@ -151,7 +151,13 @@
 RUBY_EXTERN int snprintf(char *, size_t n, char const *, ...);
 #endif
 #ifndef HAVE_VSNPRINTF
+# if _MSC_VER >= 1300
+#  pragma warning(disable: 4273)
+# endif
 RUBY_EXTERN int vsnprintf(char *, size_t n, char const *, va_list);
+# if _MSC_VER >= 1300
+#  pragma warning(default: 4273)
+# endif
 #endif
 
 #ifndef HAVE_STRLCPY
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21305)
+++ ruby_1_9_1/ChangeLog	(revision 21306)
@@ -1,3 +1,7 @@
+Fri Jan  2 23:33:38 2009  NAKAMURA Usaku  <usa@r...>
+
+	* include/ruby/missing.h, sprintf.c: get rid of a warning of VC++.
+
 Fri Jan  2 10:20:24 2009  Yukihiro Matsumoto  <matz@r...>
 
 	* lib/singleton.rb: fix documentation. [ruby-core:21038]
Index: ruby_1_9_1/sprintf.c
===================================================================
--- ruby_1_9_1/sprintf.c	(revision 21305)
+++ ruby_1_9_1/sprintf.c	(revision 21306)
@@ -1084,13 +1084,7 @@
 #undef snprintf
 #define FLOATING_POINT 1
 #define BSD__dtoa ruby_dtoa
-#if _MSC_VER >= 1300
-#pragma warning(disable: 4273)
-#endif
 #include "missing/vsnprintf.c"
-#if _MSC_VER >= 1300
-#pragma warning(default: 4273)
-#endif
 
 static int
 ruby__sfvwrite(register rb_printf_buffer *fp, register struct __suio *uio)

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