nobu	2008-06-28 20:50:38 +0900 (Sat, 28 Jun 2008)

  New Revision: 17633

  Modified files:
    branches/mvm/.merged-trunk-revision
    branches/mvm/ChangeLog
    branches/mvm/include/ruby/intern.h
    trunk/ChangeLog
    trunk/include/ruby/intern.h

  Log:
    * include/ruby/intern.h (rb_str_new2, rb_tainted_str_new2,
      rb_usascii_str_new2): use inline versions for gcc 4 or lator.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=17633&r2=17632&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/ChangeLog?r1=17633&r2=17632&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/include/ruby/intern.h?r1=17633&r2=17632&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/include/ruby/intern.h?r1=17633&r2=17632&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/mvm/.merged-trunk-revision?r1=17633&r2=17632&diff_format=u

Index: include/ruby/intern.h
===================================================================
--- include/ruby/intern.h	(revision 17632)
+++ include/ruby/intern.h	(revision 17633)
@@ -535,7 +535,7 @@
 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));})
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 17632)
+++ ChangeLog	(revision 17633)
@@ -1,3 +1,8 @@
+Sat Jun 28 20:50:35 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@f...>
 
 	* test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
Index: mvm/include/ruby/intern.h
===================================================================
--- mvm/include/ruby/intern.h	(revision 17632)
+++ mvm/include/ruby/intern.h	(revision 17633)
@@ -535,7 +535,7 @@
 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));})
Index: mvm/ChangeLog
===================================================================
--- mvm/ChangeLog	(revision 17632)
+++ mvm/ChangeLog	(revision 17633)
@@ -1,3 +1,8 @@
+Sat Jun 28 20:50:35 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@f...>
 
 	* test/rubygems/test_gem.rb (test_self_path_APPLE_GEM_HOME): don't use
Index: mvm/.merged-trunk-revision
===================================================================
--- mvm/.merged-trunk-revision	(revision 17632)
+++ mvm/.merged-trunk-revision	(revision 17633)
@@ -1 +1 @@
-17612
+17632

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/