summaryrefslogtreecommitdiff
path: root/lib/glob.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-02-24 20:44:32 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-02-24 20:45:51 -0800
commitecc5d3e148115ba09409139d4d6db810b5a270aa (patch)
tree6fb501d14092cd2fe8b770d84e3b652e9b98dfa7 /lib/glob.c
parent17f1e64f00011fb745019119e21b26e4aba65e4b (diff)
downloadgnulib-ecc5d3e148115ba09409139d4d6db810b5a270aa.tar.gz
glob, etc.: port to MSVC v18 on MS-Windows 8.1
* lib/dirent--.h (GNULIB_defined_opendir): * lib/dirent.in.h (GNULIB_defined_opendir) (GNULIB_defined_closedir): * lib/getcwd.c, lib/glob.c, lib/mountlist.c (opendir, closedir): #undef only if Gnulib defined it.
Diffstat (limited to 'lib/glob.c')
-rw-r--r--lib/glob.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/glob.c b/lib/glob.c
index f13cb8a267..ed49a9d2f6 100644
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -188,8 +188,12 @@ static const char *next_brace_sub (const char *begin, int flags) __THROWNL;
therefore save some unnecessary recursion in fchdir.c and opendir_safer.c.
FIXME - if the kernel ever adds support for multi-thread safety for
avoiding standard fds, then we should use opendir_safer. */
-# undef opendir
-# undef closedir
+# ifdef GNULIB_defined_opendir
+# undef opendir
+# endif
+# ifdef GNULIB_defined_closedir
+# undef closedir
+# endif
# if HAVE_ALLOCA
/* The OS usually guarantees only one guard page at the bottom of the stack,