Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Mon, 22 Nov 2010 05:15:39 +0000 shyouhei <shyouhei@b2dd03c8-39d4-4d8f…

…-98ff-823fe69b080e>

 merge revision(s) 29849:
 ?\012
 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 <shyouhei@ruby-lang.org>



git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8_7@29867 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
  • Loading branch information...
commit 8b161a6a2e4aed4c3a5b16a8534d21cd17e90dbb 1 parent 0f1db27
@shyouhei shyouhei authored
View
10 ChangeLog
@@ -1,3 +1,13 @@
+Mon Nov 22 14:13:45 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * ext/win32ole/win32ole.c: fix checking version of GCC.
+
+Mon Nov 22 14:13:45 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
+
+ * 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 <shyouhei@ruby-lang.org>
* Makefile.in (fake.rb): hook needed to fake mkmf.rb.
View
2  ext/win32ole/extconf.rb
@@ -35,7 +35,5 @@ def create_win32ole_makefile
case RUBY_PLATFORM
when /mswin32/
$CFLAGS += ' /W3'
-when /cygwin/, /mingw/
- $defs << '-DNONAMELESSUNION'
end
create_win32ole_makefile
View
18 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 <ctype.h>
+
#include <windows.h>
#include <ocidl.h>
#include <olectl.h>
@@ -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)
View
2  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
Please sign in to comment.
Something went wrong with that request. Please try again.