From 84f81ccc45c694ac7f61d76d99a4e5934d5b3d83 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 3 Jan 2008 16:20:29 +0000
Subject: * win32.h: only VC6 needs extern "C++" for math.h. 
 [ruby-talk:285660]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 include/ruby/win32.h | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'include/ruby')

diff --git a/include/ruby/win32.h b/include/ruby/win32.h
index 79e339689..3b7b11313 100644
--- a/include/ruby/win32.h
+++ b/include/ruby/win32.h
@@ -46,17 +46,19 @@ extern "C" {
 #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 @@ typedef unsigned int uintptr_t;
 # endif
 #endif
 
-#if defined(__cplusplus)
-}
-#endif
-
 #ifdef _M_IX86
 # define WIN95 1
 #else
-- 
cgit