merges r25440 from trunk into ruby_1_9_1.

--
* lib/pathname.rb (Pathname::SAME_PATHS): FNM_SYSCASE is always
  non-nil.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@26501 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e1d45b588f..9c93b17910 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 23 09:12:59 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/pathname.rb (Pathname::SAME_PATHS): FNM_SYSCASE is always
+	  non-nil.
+
 Thu Oct 22 20:20:27 2009  Tanaka Akira  <akr@fsij.org>
 
 	* test/ruby/envutil.rb (assert_in_out_err): test_stdout and
diff --git a/lib/pathname.rb b/lib/pathname.rb
index fbb42a66a1..0685a17261 100644
--- a/lib/pathname.rb
+++ b/lib/pathname.rb
@@ -195,7 +195,7 @@ class Pathname
     TO_PATH = :to_path
   end
 
-  SAME_PATHS = if File::FNM_SYSCASE
+  SAME_PATHS = if File::FNM_SYSCASE.nonzero?
     proc {|a, b| a.casecmp(b).zero?}
   else
     proc {|a, b| a == b}
diff --git a/version.h b/version.h
index beaac38ef6..123dd64dc5 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 406
+#define RUBY_PATCHLEVEL 407
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1