1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-01-03 16:20:29 +00:00
parent 52ed8c4edd
commit 97751bbd5a
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Fri Jan 4 01:20:21 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32.h: only VC6 needs extern "C++" for math.h. [ruby-talk:285660]
Fri Jan 4 00:54:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org> Fri Jan 4 00:54:43 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* include/ruby/oniguruma.h: Oniguruma 1.9.1 merged. * include/ruby/oniguruma.h: Oniguruma 1.9.1 merged.

14
include/ruby/win32.h
View File

@ -46,17 +46,19 @@ extern "C" {
#undef finally #undef finally
#undef leave #undef leave
#if defined(__cplusplus)
extern "C++" {
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <direct.h> #include <direct.h>
#include <process.h> #include <process.h>
#include <time.h> #include <time.h>
#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
extern "C++" { /* template without extern "C++" */
#endif
#include <math.h> #include <math.h>
#if defined(__cplusplus) && defined(_MSC_VER) && _MSC_VER == 1200
}
#endif
#include <signal.h> #include <signal.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
@ -88,10 +90,6 @@ typedef unsigned int uintptr_t;
# endif # endif
#endif #endif
#if defined(__cplusplus)
}
#endif
#ifdef _M_IX86 #ifdef _M_IX86
# define WIN95 1 # define WIN95 1
#else #else