From 46043b22944ea3493b01d888a7c7a6f7b002c8e6 Mon Sep 17 00:00:00 2001 From: akr Date: Sun, 8 Jan 2006 05:21:17 +0000 Subject: [PATCH] * eval.c (GCC_VERSION_BEFORE): check __INTEL_COMPILER. Intel C++ Compiler defines __GNUC__. http://www.intel.com/software/products/compilers/clin/docs/ug_cpp/lin1077.htm git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9807 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ eval.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 26740f8a64..070a970b6b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jan 8 14:15:27 2006 Tanaka Akira + + * eval.c (GCC_VERSION_BEFORE): check __INTEL_COMPILER. + Intel C++ Compiler defines __GNUC__. + http://www.intel.com/software/products/compilers/clin/docs/ug_cpp/lin1077.htm + Sat Jan 7 15:40:07 2006 Nobuyoshi Nakada * parse.y (singleton): get rid of segfault on syntax error. diff --git a/eval.c b/eval.c index 9fb3f7330e..4ece8a8634 100644 --- a/eval.c +++ b/eval.c @@ -133,7 +133,7 @@ rb_jump_context(env, val) * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=22127 */ #define GCC_VERSION_BEFORE(major, minor, patchlevel) \ - (defined (__GNUC__) && \ + (defined(__GNUC__) && !defined(__INTEL_COMPILER) && \ ((__GNUC__ < (major)) || \ (__GNUC__ == (major) && __GNUC_MINOR__ < (minor)) || \ (__GNUC__ == (major) && __GNUC_MINOR__ == (minor) && __GNUC_PATCHLEVEL__ < (patchlevel))))