From 16b5c5e928b85c387a79f5ce846f68b6db98bd9d Mon Sep 17 00:00:00 2001 From: shyouhei Date: Mon, 22 Nov 2010 07:22:26 +0000 Subject: [PATCH] Mon, 22 Nov 2010 05:15:39 +0000 shyouhei merge revision(s) 29849: merge revision(s) 28835,28894: * ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc version is older than 3.4.4. [ruby-core:31567] [Bug #3637] * ext/win32ole/extconf.rb: ditto. * ext/win32ole/win32ole.c: fix checking version of GCC. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@29849 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@29867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 10 ++++++++++ ext/win32ole/extconf.rb | 2 -- ext/win32ole/win32ole.c | 18 ++++++++++++++++-- version.h | 2 +- 4 files changed, 27 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 63e4f4e80b..fe5b7a869d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +Mon Nov 22 14:13:45 2010 Masaki Suketa + + * ext/win32ole/win32ole.c: fix checking version of GCC. + +Mon Nov 22 14:13:45 2010 Masaki Suketa + + * ext/win32ole/win32ole.c: NONAMELESSUNION defined only if gcc + version is older than 3.4.4. [ruby-core:31567] [Bug #3637] + * ext/win32ole/extconf.rb: ditto. + Fri Nov 19 19:28:00 2010 URABE Shyouhei * Makefile.in (fake.rb): hook needed to fake mkmf.rb. diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb index cee922554a..565964cb81 100644 --- a/ext/win32ole/extconf.rb +++ b/ext/win32ole/extconf.rb @@ -35,7 +35,5 @@ end case RUBY_PLATFORM when /mswin32/ $CFLAGS += ' /W3' -when /cygwin/, /mingw/ - $defs << '-DNONAMELESSUNION' end create_win32ole_makefile diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index bc268375f5..f5d75fedb9 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -17,6 +17,20 @@ #include "ruby.h" #include "st.h" + +#define GNUC_OLDER_3_4_4 \ + ((__GNUC__ < 3) || \ + ((__GNUC__ <= 3) && (__GNUC_MINOR__ < 4)) || \ + ((__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4))) + +#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4) +#ifndef NONAMELESSUNION +#define NONAMELESSUNION 1 +#endif +#endif + +#include + #include #include #include @@ -36,13 +50,13 @@ #define DOUTI(x) fprintf(stderr, "[%ld]:" #x "=%d\n",__LINE__,x) #define DOUTD(x) fprintf(stderr, "[%d]:" #x "=%f\n",__LINE__,x) -#if defined NONAMELESSUNION && __GNUC__ +#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4) #define V_UNION1(X, Y) ((X)->u.Y) #else #define V_UNION1(X, Y) ((X)->Y) #endif -#if defined NONAMELESSUNION && __GNUC__ +#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4) #undef V_UNION #define V_UNION(X,Y) ((X)->n1.n2.n3.Y) diff --git a/version.h b/version.h index c50ac51721..32fa909d8e 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-11-22" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20101122 -#define RUBY_PATCHLEVEL 316 +#define RUBY_PATCHLEVEL 317 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8