diff options
| author | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-02 12:21:00 +0000 |
|---|---|---|
| committer | suke <suke@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-08-02 12:21:00 +0000 |
| commit | d4fc0799b7cc9fbb7af1bcc6580e1e3091dd087b (patch) | |
| tree | dcf2f0f394b3dd8b765a1dd041ece7f1677b43ea /ext/win32ole | |
| parent | 6198f539bb0897886f53e2ff77045a8d051fb5c1 (diff) | |
* 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.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/win32ole')
| -rw-r--r-- | ext/win32ole/extconf.rb | 2 | ||||
| -rw-r--r-- | ext/win32ole/win32ole.c | 12 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ext/win32ole/extconf.rb b/ext/win32ole/extconf.rb index b4f09fc7c0..893793382b 100644 --- a/ext/win32ole/extconf.rb +++ b/ext/win32ole/extconf.rb @@ -38,7 +38,5 @@ end case RUBY_PLATFORM when /mswin/ $CFLAGS += ' /W3' -when /cygwin/, /mingw/ - $defs << '-DNONAMELESSUNION' end create_win32ole_makefile diff --git a/ext/win32ole/win32ole.c b/ext/win32ole/win32ole.c index 50743e7a47..a6db6a03b2 100644 --- a/ext/win32ole/win32ole.c +++ b/ext/win32ole/win32ole.c @@ -18,7 +18,15 @@ #include "ruby/ruby.h" #include "ruby/st.h" #include "ruby/encoding.h" + +#if (defined(__GNUC__)) && (__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4) +#ifndef NONAMELESSUNION +#define NONAMELESSUNION 1 +#endif +#endif + #include <ctype.h> + #include <windows.h> #include <ocidl.h> #include <olectl.h> @@ -43,13 +51,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__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 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__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4) #undef V_UNION #define V_UNION(X,Y) ((X)->n1.n2.n3.Y) |