summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-28 11:50:38 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-06-28 11:50:38 +0000
commit35a669fdf87a88a014cec1237b42979d89574049 (patch)
treecab4bae86e955ccba0b8312ffac0e92470a97993
parent5e18ae782dc162421f9b15b613894aaba7b23eae (diff)
downloadruby-35a669fdf87a88a014cec1237b42979d89574049.tar.gz
ruby-35a669fdf87a88a014cec1237b42979d89574049.tar.xz
ruby-35a669fdf87a88a014cec1237b42979d89574049.zip
* include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
rb_usascii_str_new2): use inline versions for gcc 4 or lator. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@17633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--include/ruby/intern.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 85b50c39d..c07af6c12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Jun 28 20:50:35 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
+ rb_usascii_str_new2): use inline versions for gcc 4 or lator.
+
Sat Jun 28 13:12:06 2008 Tanaka Akira <akr@fsij.org>
* test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index fdd388792..f109cf75e 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -535,7 +535,7 @@ VALUE rb_str_buf_new2(const char*);
VALUE rb_str_tmp_new(long);
VALUE rb_usascii_str_new(const char*, long);
VALUE rb_usascii_str_new2(const char*);
-#if defined __GNUC__ && defined __OPTIMIZE__ && __OPTIMIZE__
+#if __GNUC__ >= 4 && defined __OPTIMIZE__ && __OPTIMIZE__
#define rb_str_new2(str) ({const char *_s = (str); rb_str_new(_s, strlen(_s));})
#define rb_tainted_str_new2(str) ({const char *_s = (str); rb_tainted_str_new(_s, strlen(_s));})
#define rb_usascii_str_new2(str) ({const char *_s = (str); rb_usascii_str_new(_s, strlen(_s));})