[前][次][番号順一覧][スレッド一覧]

ruby-changes:25504

From: usa <ko1@a...>
Date: Thu, 8 Nov 2012 17:34:28 +0900 (JST)
Subject: [ruby-changes:25504] usa:r37561 (ruby_1_9_3): merge revision(s) 37527: [Backport #7293]

usa	2012-11-08 17:34:18 +0900 (Thu, 08 Nov 2012)

  New Revision: 37561

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

  Log:
    merge revision(s) 37527: [Backport #7293]
    
    * ext/zlib/extconf.rb: Recognize zlibwapi as linking library.
      Patch by Daniel Berger.
      [ruby-core:44979] [Feature #6421]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/ext/zlib/extconf.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 37560)
+++ ruby_1_9_3/ChangeLog	(revision 37561)
@@ -1,3 +1,10 @@
+Thu Nov  8 17:33:53 2012  Luis Lavena  <luislavena@g...>
+
+	* ext/zlib/extconf.rb: Recognize zlibwapi as linking library.
+	  Patch by Daniel Berger.
+
+	  [ruby-core:44979] [Feature #6421]
+
 Thu Nov  8 16:17:54 2012  NAKAMURA Usaku  <usa@r...>
 
 	* test/ruby/test_dir_m17n.rb: remove a garbage.
Index: ruby_1_9_3/ext/zlib/extconf.rb
===================================================================
--- ruby_1_9_3/ext/zlib/extconf.rb	(revision 37560)
+++ ruby_1_9_3/ext/zlib/extconf.rb	(revision 37561)
@@ -10,7 +10,7 @@
 dir_config 'zlib'
 
 
-if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and
+if %w'z libz zlib1 zlib zdll zlibwapi'.find {|z| have_library(z, 'deflateReset')} and
     have_header('zlib.h') then
 
   defines = []
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 37560)
+++ ruby_1_9_3/version.h	(revision 37561)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 316
+#define RUBY_PATCHLEVEL 317
 
 #define RUBY_RELEASE_DATE "2012-11-08"
 #define RUBY_RELEASE_YEAR 2012

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r37527


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

[前][次][番号順一覧][スレッド一覧]