summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-30 05:26:49 +0000
committereban <eban@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2005-12-30 05:26:49 +0000
commit1089ff2d1e337722e4ee5e1b33ed5a6510bbc435 (patch)
tree8c21a7413c4aff4cc8ef967d6fa6bf2c8da59542
parent4c585eeddb11697fc19355b22c1b306e301ee462 (diff)
downloadruby-1089ff2d1e337722e4ee5e1b33ed5a6510bbc435.tar.gz
ruby-1089ff2d1e337722e4ee5e1b33ed5a6510bbc435.tar.xz
ruby-1089ff2d1e337722e4ee5e1b33ed5a6510bbc435.zip
* dir.c (glob_helper): do not use TRUE for djgpp.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@9769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--dir.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index f9ccb0a57..b6d730cce 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Fri Dec 30 14:24:53 2005 WATANABE Hirofumi <eban@ruby-lang.org>
+
+ * dir.c (glob_helper): do not use TRUE for djgpp.
+
Fri Dec 30 04:54:40 2005 NAKAMURA Usaku <usa@ruby-lang.org>
* file.c (eaccess): workaround for VC++8 runtime.
diff --git a/dir.c b/dir.c
index d058334ac..22f68913d 100644
--- a/dir.c
+++ b/dir.c
@@ -919,13 +919,9 @@ glob_helper(path, sub, flags, func, arg)
p = sub ? sub : path;
if (!has_magic(p, 0, flags)) {
- if (
-#if defined DOSISH
- TRUE
-#else
- !(flags & FNM_NOESCAPE)
+#if !defined DOSISH
+ if (!(flags & FNM_NOESCAPE))
#endif
- )
{
newpath = strdup(path);
if (sub) {