yugui	2009-07-27 00:31:38 +0900 (Mon, 27 Jul 2009)

  New Revision: 24287

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

  Log:
    merges r24179 from trunk into ruby_1_9_1.
    --
    * include/ruby/win32.h: include winsock headers in extern "C++" for
      C++ extension libraries.
    * include/ruby/missing.h (vsnprintf): workaround for VC++.
      [ruby-core:23096]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/include/ruby/missing.h
    branches/ruby_1_9_1/include/ruby/win32.h
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/include/ruby/missing.h
===================================================================
--- ruby_1_9_1/include/ruby/missing.h	(revision 24286)
+++ ruby_1_9_1/include/ruby/missing.h	(revision 24287)
@@ -151,13 +151,7 @@
 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
+extern int vsnprintf(char *, size_t n, char const *, va_list);
 #endif
 
 #ifndef HAVE_STRLCPY
Index: ruby_1_9_1/include/ruby/win32.h
===================================================================
--- ruby_1_9_1/include/ruby/win32.h	(revision 24286)
+++ ruby_1_9_1/include/ruby/win32.h	(revision 24287)
@@ -27,9 +27,15 @@
 
 // #include <stdarg.h> conflict with varargs.h?
 #if !defined(WSAAPI)
+#if defined(__cplusplus) && defined(_MSC_VER)
+extern "C++" {			/* template without extern "C++" */
+#endif
 #include <winsock2.h>
 #include <ws2tcpip.h>
+#if defined(__cplusplus) && defined(_MSC_VER)
+}
 #endif
+#endif
 
 #define NT 1			/* deprecated */
 
Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24286)
+++ ruby_1_9_1/ChangeLog	(revision 24287)
@@ -1,3 +1,11 @@
+Sat Jul 18 06:30:35 2009  NAKAMURA Usaku  <usa@r...>
+
+	* include/ruby/win32.h: include winsock headers in extern "C++" for
+	  C++ extension libraries.
+
+	* include/ruby/missing.h (vsnprintf): workaround for VC++.
+	  [ruby-core:23096]
+
 Sat Jul 18 00:23:47 2009  Yuki Sonoda (Yugui)  <yugui@y...>
 
 	* ext/readline/readline.c (Init_readline): rl_catch_signals does
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24286)
+++ ruby_1_9_1/version.h	(revision 24287)
@@ -1,12 +1,13 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_RELEASE_DATE "2009-07-27"
-#define RUBY_PATCHLEVEL 244
+#define RUBY_PATCHLEVEL 245
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1
+
 #define RUBY_RELEASE_YEAR 2009
 #define RUBY_RELEASE_MONTH 7
 #define RUBY_RELEASE_DAY 27
+#define RUBY_RELEASE_DATE "2009-07-27"
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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