From 97751bbd5a3a6b66f91932ff3292f5b113ee964f Mon Sep 17 00:00:00 2001 From: nobu 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: svn+ssh://ci.ruby-lang.org/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 79e3396892..3b7b113133 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 #include #include #include #include #include +#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200 +extern "C++" { /* template without extern "C++" */ +#endif #include +#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200 +} +#endif #include #include #include @@ -88,10 +90,6 @@ typedef unsigned int uintptr_t; # endif #endif -#if defined(__cplusplus) -} -#endif - #ifdef _M_IX86 # define WIN95 1 #else -- cgit v1.2.3