yugui	2010-08-09 13:39:49 +0900 (Mon, 09 Aug 2010)

  New Revision: 28932

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28932

  Log:
    merges r28894 from trunk into ruby_1_9_2. This fixes [ruby-dev:41962].
    --
    * ext/win32ole/win32ole.c: fix checking version of GCC.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/ext/win32ole/win32ole.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28931)
+++ ruby_1_9_2/ChangeLog	(revision 28932)
@@ -1,3 +1,7 @@
+Sat Aug  7 09:47:06 2010  Masaki Suketa <masaki.suketa@n...>
+
+	* ext/win32ole/win32ole.c: fix checking version of GCC.
+
 Mon Aug  2 21:51:16 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* ruby.c (ruby_init_loadpath_safe): rb_str_set_len modifies ptr
Index: ruby_1_9_2/ext/win32ole/win32ole.c
===================================================================
--- ruby_1_9_2/ext/win32ole/win32ole.c	(revision 28931)
+++ ruby_1_9_2/ext/win32ole/win32ole.c	(revision 28932)
@@ -19,7 +19,12 @@
 #include "ruby/st.h"
 #include "ruby/encoding.h"
 
-#if (defined(__GNUC__)) && (__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4)
+#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
@@ -51,13 +56,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(__GNUC__)) && (__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4)
+#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(__GNUC__)) && (__GNUC__ <= 3) && (__GNUC_MINOR__ <= 4) && (__GNUC_PATCHLEVEL__ <= 4)
+#if (defined(__GNUC__)) && (GNUC_OLDER_3_4_4) 
 #undef V_UNION
 #define V_UNION(X,Y) ((X)->n1.n2.n3.Y)
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/