diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-03 16:20:29 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-03 16:20:29 +0000 |
| commit | 555d0728924f43d14f63288043036449804b3344 (patch) | |
| tree | 3c4319f1b921cf70ed32d2f3e15059d719b0308d | |
| parent | bf89a51315824d3563adbe478865ab47a8f33113 (diff) | |
* win32.h: only VC6 needs extern "C++" for math.h. [ruby-talk:285660]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@14875 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | bcc32/Makefile.sub | 1 | ||||
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | win32/win32.h | 14 |
4 files changed, 14 insertions, 11 deletions
@@ -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] + Thu Jan 3 11:28:58 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * io.c (fptr_finalize): clear errno first. [ruby-talk:284492] diff --git a/bcc32/Makefile.sub b/bcc32/Makefile.sub index d3eebc8cb2..e9f7296856 100644 --- a/bcc32/Makefile.sub +++ b/bcc32/Makefile.sub @@ -263,6 +263,7 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/bcc32/Makefile.sub \#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 @@ -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[]; diff --git a/win32/win32.h b/win32/win32.h index 87f4d4867a..d9311076ec 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -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 @@ extern "C++" { #include <io.h> #include <malloc.h> -#if defined(__cplusplus) -} -#endif - #ifdef _M_IX86 # define WIN95 1 #else |