summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-18 03:04:49 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-02-18 03:04:49 +0000
commit679b4b95285b54c0ccb359a0beb88ed954117d9a (patch)
treec7023d0a616c81481e929dbfb542b5f2ac9370f7
parent0550f4cdfaef6d59aa1cb995fd744e5620a08a8e (diff)
* file.c: removed trailing spaces.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@22392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--file.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/file.c b/file.c
index bf0c0b4b53..b60ab9bf9e 100644
--- a/file.c
+++ b/file.c
@@ -2296,11 +2296,13 @@ rb_file_s_umask(argc, argv)
#define isdirsep(x) ((x) == '/')
#endif
+#ifndef USE_NTFS
#if defined _WIN32 || defined __CYGWIN__
#define USE_NTFS 1
#else
#define USE_NTFS 0
#endif
+#endif
#ifdef DOSISH_DRIVE_LETTER
#include <ctype.h>
@@ -2732,7 +2734,7 @@ file_expand_path(fname, dname, result)
}
if (p == skiproot(buf) - 1) p++;
-#if USE_NTFS
+#if USE_NTFS && defined __WIN32__
*p = '\0';
if ((s = strrdirsep(b = buf)) != 0 && !strpbrk(s, "*?")) {
size_t len;