ruby-changes:16898
From: suke <ko1@a...>
Date: Sat, 7 Aug 2010 09:51:38 +0900 (JST)
Subject: [ruby-changes:16898] Ruby:r28894 (trunk): * ext/win32ole/win32ole.c: fix checking version of GCC.
suke 2010-08-07 09:49:59 +0900 (Sat, 07 Aug 2010) New Revision: 28894 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28894 Log: * ext/win32ole/win32ole.c: fix checking version of GCC. Modified files: trunk/ChangeLog trunk/ext/win32ole/win32ole.c Index: ChangeLog =================================================================== --- ChangeLog (revision 28893) +++ ChangeLog (revision 28894) @@ -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. + Sat Aug 7 09:31:48 2010 Tanaka Akira <akr@f...> * ext/pathname/pathname.c (Init_pathname): fix number of arguments for Index: ext/win32ole/win32ole.c =================================================================== --- ext/win32ole/win32ole.c (revision 28893) +++ ext/win32ole/win32ole.c (revision 28894) @@ -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/