summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/glob.c12
2 files changed, 5 insertions, 12 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 54121d7dd..bc70eed7e 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,10 @@
2003-03-19 Corinna Vinschen <corinna@vinschen.de>
+ * glob.c: Eliminate __INSIDE_CYGWIN__ preprocessor conditionals
+ throughout.
+
+2003-03-19 Corinna Vinschen <corinna@vinschen.de>
+
* fhandler_disk_file.cc (fhandler_disk_file::fstat_helper): Fix
wrong usage of S_IFDIR.
* security.cc (get_attribute_from_acl): Ditto.
diff --git a/winsup/cygwin/glob.c b/winsup/cygwin/glob.c
index 37e0317a6..1db8685aa 100644
--- a/winsup/cygwin/glob.c
+++ b/winsup/cygwin/glob.c
@@ -97,11 +97,7 @@ __weak_alias(__globfree13,___globfree13);
#ifdef __LIBC12_SOURCE__
#define STAT stat12
#else
-#if defined (__INSIDE_CYGWIN__)
#define STAT __stat64
-#else
-#define STAT stat
-#endif
#endif
#define DOLLAR '$'
@@ -847,11 +843,7 @@ g_lstat(fn, sb, pglob)
stat32_to_STAT (&lsb, sb);
return ret;
}
-#ifdef __INSIDE_CYGWIN__
return(lstat64(buf, sb));
-#else
- return(lstat(buf, sb));
-#endif
}
static int
@@ -873,11 +865,7 @@ g_stat(fn, sb, pglob)
stat32_to_STAT (&lsb, sb);
return ret;
}
-#ifdef __INSIDE_CYGWIN__
return(stat64(buf, sb));
-#else
- return(stat(buf, sb));
-#endif
}
static Char *