From fd8a1c725b876b83d8a6b835b0113be0d83befc6 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 26 May 2010 11:04:43 +0000
Subject: [PATCH] * file.c (file_expand_path): revert a part of r22392. it's
 commit miss.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28027 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog | 4 ++++
 file.c    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 3d94aa5122..6e86fb01a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed May 26 19:55:33 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* file.c (file_expand_path): revert a part of r22392. it's commit miss.
+
 Wed May 26 18:40:23 2010  Masaya Tarui  <tarui@ruby-lang.org>
 
 	* test/rinda/test_rinda.rb (TupleSpaceTest, TupleSpaceProxyTest):
diff --git a/file.c b/file.c
index 2ee13cdc92..bc072a93d7 100644
--- a/file.c
+++ b/file.c
@@ -3051,7 +3051,7 @@ file_expand_path(VALUE fname, VALUE dname, int abs_mode, VALUE result)
     }
     if (p == skiproot(buf) - 1) p++;
 
-#if USE_NTFS && defined __WIN32__
+#if USE_NTFS
     *p = '\0';
     if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
 	size_t len;