ruby-changes:5838
From: shyouhei <ko1@a...>
Date: Sun, 15 Jun 2008 23:31:58 +0900 (JST)
Subject: [ruby-changes:5838] Ruby:r17345 (ruby_1_8_5): merge revision(s) 16677:
shyouhei 2008-06-15 23:31:47 +0900 (Sun, 15 Jun 2008) New Revision: 17345 Modified files: branches/ruby_1_8_5/ChangeLog branches/ruby_1_8_5/ext/zlib/extconf.rb branches/ruby_1_8_5/version.h Log: merge revision(s) 16677: http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/version.h?r1=17345&r2=17344&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ext/zlib/extconf.rb?r1=17345&r2=17344&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_5/ChangeLog?r1=17345&r2=17344&diff_format=u Index: ruby_1_8_5/ext/zlib/extconf.rb =================================================================== --- ruby_1_8_5/ext/zlib/extconf.rb (revision 17344) +++ ruby_1_8_5/ext/zlib/extconf.rb (revision 17345) @@ -10,7 +10,7 @@ dir_config 'zlib' -if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and +if %w'z libz zlib1 zlib zdll'.find {|z| have_library(z, 'deflateReset')} and have_header('zlib.h') then defines = [] @@ -22,7 +22,7 @@ os_code = 'AMIGA' when /\Aos2[\-_]emx\z/ then os_code = 'OS2' - when 'mswin32', 'mingw32', 'bccwin32' then + when /mswin|mingw|bccwin/ then # NOTE: cygwin should be regarded as Unix. os_code = 'WIN32' else Index: ruby_1_8_5/ChangeLog =================================================================== --- ruby_1_8_5/ChangeLog (revision 17344) +++ ruby_1_8_5/ChangeLog (revision 17345) @@ -1,3 +1,9 @@ +Sun Jun 15 23:31:10 2008 Nobuyoshi Nakada <nobu@r...> + + * ext/zlib/extconf.rb: search zlib1, and regard mswin32 later than VC6 + as WIN32. [ruby-core:16984] + + Sun Jun 15 23:27:31 2008 Nobuyoshi Nakada <nobu@r...> * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search Index: ruby_1_8_5/version.h =================================================================== --- ruby_1_8_5/version.h (revision 17344) +++ ruby_1_8_5/version.h (revision 17345) @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2008-06-15" #define RUBY_VERSION_CODE 185 #define RUBY_RELEASE_CODE 20080615 -#define RUBY_PATCHLEVEL 219 +#define RUBY_PATCHLEVEL 220 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/