mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/win32ole/win32ole.c: fix checking version of GCC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28894 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d1893fe74d
commit
93426cd6e8
2 changed files with 12 additions and 3 deletions
|
@ -1,3 +1,7 @@
|
|||
Sat Aug 7 09:47:06 2010 Masaki Suketa <masaki.suketa@nifty.ne.jp>
|
||||
|
||||
* ext/win32ole/win32ole.c: fix checking version of GCC.
|
||||
|
||||
Sat Aug 7 09:31:48 2010 Tanaka Akira <akr@fsij.org>
|
||||
|
||||
* ext/pathname/pathname.c (Init_pathname): fix number of arguments for
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in a new issue