nobu	2012-04-17 23:22:01 +0900 (Tue, 17 Apr 2012)

  New Revision: 35369

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=35369

  Log:
    merge revision(s) 35368:
    
    * ext/-test-/win32/dln/extconf.rb: fix for mingw.

  Modified files:
    branches/ruby_1_9_3/ext/-test-/win32/dln/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ext/-test-/win32/dln/extconf.rb
===================================================================
--- ruby_1_9_3/ext/-test-/win32/dln/extconf.rb	(revision 35368)
+++ ruby_1_9_3/ext/-test-/win32/dln/extconf.rb	(revision 35369)
@@ -1,4 +1,4 @@
-if /mswin|mingw/ =~ RUBY_PLATFORM
+if $mingw or $mswin
   $objs = ["dlntest.o"]
   $cleanfiles << "$(topdir)/dlntest.dll"
   config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)}
@@ -9,10 +9,11 @@
   open("Makefile", "wb") do |mf|
     mf.puts m, "\n"
     sodir = $extout ? "$(RUBYARCHDIR)/" : ''
-    mf.print "#{sodir}$(DLLIB): dlntest.#{$LIBEXT}"
+    mf.print "#{sodir}$(DLLIB): $(topdir)/dlntest.dll"
     mf.puts
-    mf.puts "dlntest.#{$LIBEXT}: $(topdir)/dlntest.dll"
-    mf.puts
+    if $mingw
+      mf.puts "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def"
+    end
     mf.puts depend_rules("$(topdir)/dlntest.dll: libdlntest.o libdlntest.def")
     mf.puts "\t$(ECHO) linking shared-object $(@F)\n"
     mf.print "\t-$(Q)$(RM) $@\n"
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 35368)
+++ ruby_1_9_3/version.h	(revision 35369)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 188
+#define RUBY_PATCHLEVEL 189
 
 #define RUBY_RELEASE_DATE "2012-04-17"
 #define RUBY_RELEASE_YEAR 2012

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