summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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 85b50c39d5..c07af6c127 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 fdd388792a..f109cf75ef 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));})