shyouhei	2008-06-16 19:19:56 +0900 (Mon, 16 Jun 2008)

  New Revision: 17364

  Modified files:
    branches/ruby_1_8_5/ChangeLog
    branches/ruby_1_8_5/lib/mkmf.rb
    branches/ruby_1_8_5/version.h

  Log:
    merge revision(s) 11194:11196:
    * lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17364&r2=17363&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/lib/mkmf.rb?r1=17364&r2=17363&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17364&r2=17363&diff_format=u

Index: ruby_1_8_5/ChangeLog
===================================================================
--- ruby_1_8_5/ChangeLog	(revision 17363)
+++ ruby_1_8_5/ChangeLog	(revision 17364)
@@ -1,3 +1,7 @@
+Mon Jun 16 19:18:35 2008  NAKAMURA Usaku  <usa@r...>
+
+	* lib/mkmf.rb: fixed the bug of handling COMMON_MACROS.
+
 Mon Jun 16 17:11:32 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* mkconfig.rb: autoconf 2.61 support.  [ruby-core:10016]
Index: ruby_1_8_5/version.h
===================================================================
--- ruby_1_8_5/version.h	(revision 17363)
+++ ruby_1_8_5/version.h	(revision 17364)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2008-06-16"
 #define RUBY_VERSION_CODE 185
 #define RUBY_RELEASE_CODE 20080616
-#define RUBY_PATCHLEVEL 222
+#define RUBY_PATCHLEVEL 223
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_5/lib/mkmf.rb
===================================================================
--- ruby_1_8_5/lib/mkmf.rb	(revision 17363)
+++ ruby_1_8_5/lib/mkmf.rb	(revision 17364)
@@ -1483,9 +1483,8 @@
 
 hdr = []
 config_string('COMMON_MACROS') do |s|
-  Shellwords.shellwords(s).each do |s|
-    /(.*?)(?:=(.*))/ =~ s
-    hdr << "#define #$1 #$2"
+  Shellwords.shellwords(s).each do |w|
+    hdr << "#define " + w.split(/=/, 2).join(" ")
   end
 end
 config_string('COMMON_HEADERS') do |s|

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