From f9f11f914251b5d0baaf5c12d61cf2a20338c23e Mon Sep 17 00:00:00 2001 From: "bmeurer@chromium.org" Date: Mon, 26 Aug 2013 08:17:38 +0000 Subject: [PATCH] Further cleanup of test for V8_INFINITY. R=mstarzinger@chromium.org Review URL: https://codereview.chromium.org/23202017 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@16314 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- src/globals.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/globals.h b/src/globals.h index 478395a..2d072a0 100644 --- a/src/globals.h +++ b/src/globals.h @@ -30,19 +30,14 @@ #include "../include/v8stdint.h" -// Find a working V8_INFINITY. -#if V8_CC_GNU // Unfortunately, the INFINITY macro cannot be used with the '-pedantic' // warning flag and certain versions of GCC due to a bug: // http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11931 // For now, we use the more involved template-based version from , but // only when compiling with GCC versions affected by the bug (2.96.x - 4.0.x) -# if V8_GNUC_PREREQ(2, 96, 0) && !V8_GNUC_PREREQ(4, 1, 0) -# include // NOLINT -# define V8_INFINITY std::numeric_limits::infinity() -# else -# define V8_INFINITY INFINITY -# endif +#if V8_CC_GNU && V8_GNUC_PREREQ(2, 96, 0) && !V8_GNUC_PREREQ(4, 1, 0) +# include // NOLINT +# define V8_INFINITY std::numeric_limits::infinity() #elif V8_CC_MSVC # define V8_INFINITY HUGE_VAL #else -- 2.7.4