diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-12 18:12:45 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-05-12 18:12:45 +0000 |
commit | fb9be3fcfc7c8eb0b02881f1078279803d448ab9 (patch) | |
tree | 78797226b68bad7e7802e542542c1d092371b2e6 /internal.h | |
parent | 20a4b7bb0f8ec16da707d546cdcabe04acf4ab5a (diff) | |
download | ruby-fb9be3fcfc7c8eb0b02881f1078279803d448ab9.tar.gz |
* configurein: use alternative keyword
to avoid macros conflicts with them.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54985 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'internal.h')
-rw-r--r-- | internal.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/internal.h b/internal.h index c53b8eab95..d4565ee437 100644 --- a/internal.h +++ b/internal.h @@ -30,18 +30,18 @@ extern "C" { # define __has_attribute(x) 0 #endif -#if __has_attribute(unused) -#define UNINITIALIZED_VAR(x) x __attribute__((unused)) +#if __has_attribute(__unused__) +#define UNINITIALIZED_VAR(x) x __attribute__((__unused__)) #elif defined(__GNUC__) && __GNUC__ >= 3 #define UNINITIALIZED_VAR(x) x = x #else #define UNINITIALIZED_VAR(x) x #endif -#if __has_attribute(warn_unused_result) -#define WARN_UNUSED_RESULT(x) x __attribute__((warn_unused_result)) +#if __has_attribute(__warn_unused_result__) +#define WARN_UNUSED_RESULT(x) x __attribute__((__warn_unused_result__)) #elif defined(__GNUC__) && (__GNUC__ * 1000 + __GNUC_MINOR__) >= 3004 -#define WARN_UNUSED_RESULT(x) x __attribute__((warn_unused_result)) +#define WARN_UNUSED_RESULT(x) x __attribute__((__warn_unused_result__)) #else #define WARN_UNUSED_RESULT(x) x #endif |