nobu	2008-01-04 01:20:29 +0900 (Fri, 04 Jan 2008)

  New Revision: 14875

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/bcc32/Makefile.sub
    branches/ruby_1_8/version.h
    branches/ruby_1_8/win32/win32.h
    trunk/ChangeLog
    trunk/include/ruby/win32.h

  Log:
    * win32.h: only VC6 needs extern "C++" for math.h.  [ruby-talk:285660]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/win32/win32.h?r1=14875&r2=14874&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/win32.h?r1=14875&r2=14874&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14875&r2=14874&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14875&r2=14874&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/bcc32/Makefile.sub?r1=14875&r2=14874&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=14875&r2=14874&diff_format=u

Index: include/ruby/win32.h
===================================================================
--- include/ruby/win32.h	(revision 14874)
+++ include/ruby/win32.h	(revision 14875)
@@ -46,17 +46,19 @@
 #undef finally
 #undef leave
 
-#if defined(__cplusplus)
-extern "C++" {
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <direct.h>
 #include <process.h>
 #include <time.h>
+#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
+extern "C++" {			/* template without extern "C++" */
+#endif
 #include <math.h>
+#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
+}
+#endif
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -88,10 +90,6 @@
 # endif
 #endif
 
-#if defined(__cplusplus)
-}
-#endif
-
 #ifdef _M_IX86
 # define WIN95 1
 #else
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14874)
+++ ChangeLog	(revision 14875)
@@ -1,3 +1,7 @@
+Fri Jan  4 01:20:21 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32.h: only VC6 needs extern "C++" for math.h.  [ruby-talk:285660]
+
 Fri Jan  4 00:54:43 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* include/ruby/oniguruma.h: Oniguruma 1.9.1 merged.
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 14874)
+++ ruby_1_8/ChangeLog	(revision 14875)
@@ -1,3 +1,7 @@
+Fri Jan  4 01:20:21 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* win32.h: only VC6 needs extern "C++" for math.h.  [ruby-talk:285660]
+
 Thu Jan  3 11:28:58 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* io.c (fptr_finalize): clear errno first.  [ruby-talk:284492]
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 14874)
+++ ruby_1_8/version.h	(revision 14875)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.8.6"
-#define RUBY_RELEASE_DATE "2008-01-03"
+#define RUBY_RELEASE_DATE "2008-01-04"
 #define RUBY_VERSION_CODE 186
-#define RUBY_RELEASE_CODE 20080103
+#define RUBY_RELEASE_CODE 20080104
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 6
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 1
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 4
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/bcc32/Makefile.sub
===================================================================
--- ruby_1_8/bcc32/Makefile.sub	(revision 14874)
+++ ruby_1_8/bcc32/Makefile.sub	(revision 14875)
@@ -263,6 +263,7 @@
 \#define HAVE_STRTOD 1
 \#define HAVE_STRTOL 1
 \#define HAVE_STRTOUL 1
+\#define HAVE_VSNPRINTF 1
 \#define HAVE_ISNAN 1
 \#define HAVE_FINITE 1
 \#define HAVE_HYPOT 1
Index: ruby_1_8/win32/win32.h
===================================================================
--- ruby_1_8/win32/win32.h	(revision 14874)
+++ ruby_1_8/win32/win32.h	(revision 14875)
@@ -51,17 +51,19 @@
 #undef finally
 #undef leave
 
-#if defined(__cplusplus)
-extern "C++" {
-#endif
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <direct.h>
 #include <process.h>
 #include <time.h>
+#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
+extern "C++" {			/* template without extern "C++" */
+#endif
 #include <math.h>
+#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
+}
+#endif
 #include <signal.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -73,10 +75,6 @@
 #include <io.h>
 #include <malloc.h>
 
-#if defined(__cplusplus)
-}
-#endif
-
 #ifdef _M_IX86
 # define WIN95 1
 #else

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