Updated from libc

diff --git a/glob/ChangeLog b/glob/ChangeLog
index 6e535eef1a75407ecd7f2788a747db9207d9cc60..d8cd316bb10d42b8af6ca9de0865bdd6cdf8ec07 100644 (file)
--- a/glob/ChangeLog
+++ b/glob/ChangeLog
@@ -1,3 +1,7 @@
+Sat Apr 29 15:46:57 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
+
+       * posix/glob.c (S_ISDIR): Define if undefined.
+
 Tue Apr 25 17:17:19 1995  Roland McGrath  <roland@churchy.gnu.ai.mit.edu>
 
        * posix/glob.c (glob): If GLOB_MARK set, stat names to find

diff --git a/glob/glob.c b/glob/glob.c
index 81f3049cb27119510ce6f64014968324b54076e6..38a6d75ab2e6d215375f9a8da5cf642f71388792 100644 (file)
--- a/glob/glob.c
+++ b/glob/glob.c
@@ -181,6 +181,8 @@ extern char *alloca ();
 #endif
 #ifdef STAT_MACROS_BROKEN
 #undef S_ISDIR
+#endif
+#ifndef S_ISDIR
 #define S_ISDIR(mode) (((mode) & S_IFMT) == S_IFDIR)
 #endif
 #endif