From 165ebcb4675f7fc5cd536da586835a6cf46e0da3 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 26 Sep 2013 06:06:19 +0000 Subject: Fix compilation on gcc 4.6 if __has_feature is not defined, it can't compile git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43048 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- gc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gc.c b/gc.c index e2321c3394..34c06a8941 100644 --- a/gc.c +++ b/gc.c @@ -31,8 +31,12 @@ #include #include -#if /* is ASAN enabled? */ defined(__has_feature) ? \ - __has_feature(address_sanitizer) /* Clang */ : \ +#ifndef __has_feature +# define __has_feature(x) 0 +#endif + +#if /* is ASAN enabled? */ \ + __has_feature(address_sanitizer) /* Clang */ || \ defined(__SANITIZE_ADDRESS__) /* GCC 4.8.x */ #define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \ __attribute__((no_address_safety_analysis)) \ -- cgit v1.2.3