From ac11f944e143eaaaf596e3efb94a522502788af7 Mon Sep 17 00:00:00 2001 From: naruse Date: Thu, 12 May 2016 18:12:46 +0000 Subject: Use HAVE_BUILTIN___BUILTIN_CONSTANT_P git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54986 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- internal.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'internal.h') diff --git a/internal.h b/internal.h index d4565ee437..001a385a69 100644 --- a/internal.h +++ b/internal.h @@ -1323,8 +1323,8 @@ VALUE rb_fstring_new(const char *ptr, long len); #define rb_fstring_lit(str) rb_fstring_new((str), rb_strlen_lit(str)) #define rb_fstring_literal(str) rb_fstring_lit(str) VALUE rb_fstring_cstr(const char *str); -#if defined(__GNUC__) && !defined(__PCC__) -#define rb_fstring_cstr(str) __extension__ ( \ +#ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P +# define rb_fstring_cstr(str) __extension__ ( \ { \ (__builtin_constant_p(str)) ? \ rb_fstring_new((str), (long)strlen(str)) : \ @@ -1336,14 +1336,14 @@ VALUE rb_fstring_enc_new(const char *ptr, long len, rb_encoding *enc); #define rb_fstring_enc_lit(str, enc) rb_fstring_enc_new((str), rb_strlen_lit(str), (enc)) #define rb_fstring_enc_literal(str, enc) rb_fstring_enc_lit(str, enc) VALUE rb_fstring_enc_cstr(const char *ptr, rb_encoding *enc); -#if defined(__GNUC__) && !defined(__PCC__) -#define rb_fstring_enc_cstr(str, enc) __extension__ ( \ +# ifdef HAVE_BUILTIN___BUILTIN_CONSTANT_P +# define rb_fstring_enc_cstr(str, enc) __extension__ ( \ { \ (__builtin_constant_p(str)) ? \ rb_fstring_enc_new((str), (long)strlen(str), (enc)) : \ rb_fstring_enc_cstr(str, enc); \ }) -#endif +# endif #endif int rb_str_buf_cat_escaped_char(VALUE result, unsigned int c, int unicode_p); int rb_str_symname_p(VALUE); -- cgit v1.2.3