From c6e73d2cf82868b2313d8d6d79b501ed1c9c4ac4 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sun, 15 Jun 2008 14:31:47 +0000 Subject: merge revision(s) 16677: git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_5@17345 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ ext/zlib/extconf.rb | 4 ++-- version.h | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6b1348bee5..f55d50aac7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sun Jun 15 23:31:10 2008 Nobuyoshi Nakada + + * 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 * marshal.c (w_object, marshal_dump, r_object0, marshal_load): search diff --git a/ext/zlib/extconf.rb b/ext/zlib/extconf.rb index 14c8376417..dc0ca9a8db 100644 --- a/ext/zlib/extconf.rb +++ b/ext/zlib/extconf.rb @@ -10,7 +10,7 @@ require 'rbconfig' 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 @@ if %w'z libz zlib zdll'.find {|z| have_library(z, 'deflateReset')} and 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 diff --git a/version.h b/version.h index 6de9576768..7178ab178e 100644 --- a/version.h +++ b/version.h @@ -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 -- cgit v1.2.3