changeset 19093:dccbe71d55ba

glob: try to port recent changes to MS-Windows Problem reported by Bruno Haible in: http://lists.gnu.org/archive/html/bug-gnulib/2017-08/msg00170.html * lib/glob.c (__glob_pattern_p) [!_LIBC]: Move from here ... * lib/glob.in.h (__glob_pattern_p): ... to here.
author Paul Eggert <eggert@cs.ucla.edu>
date Thu, 24 Aug 2017 23:51:07 -0700
parents caf16d5492c0
children 5b10f2f518d5 22715ab8d448
files ChangeLog lib/glob.c lib/glob.in.h
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 24 20:28:52 2017 -0500
+++ b/ChangeLog	Thu Aug 24 23:51:07 2017 -0700
@@ -1,3 +1,11 @@
+2017-08-24  Paul Eggert  <eggert@cs.ucla.edu>
+
+	glob: try to port recent changes to MS-Windows
+	Problem reported by Bruno Haible in:
+	http://lists.gnu.org/archive/html/bug-gnulib/2017-08/msg00170.html
+	* lib/glob.c (__glob_pattern_p) [!_LIBC]: Move from here ...
+	* lib/glob.in.h (__glob_pattern_p): ... to here.
+
 2017-08-24  Eric Blake  <eblake@redhat.com>
 
 	warnings: fix compilation with old autoconf
--- a/lib/glob.c	Thu Aug 24 20:28:52 2017 -0500
+++ b/lib/glob.c	Thu Aug 24 23:51:07 2017 -0700
@@ -71,7 +71,6 @@
 #  define __alloca              alloca
 # endif
 # define __readdir              readdir
-# define __glob_pattern_p       glob_pattern_p
 # define COMPILE_GLOB64
 #endif /* _LIBC */
 
--- a/lib/glob.in.h	Thu Aug 24 20:28:52 2017 -0500
+++ b/lib/glob.in.h	Thu Aug 24 23:51:07 2017 -0700
@@ -85,6 +85,7 @@
 #define glob rpl_glob
 #define globfree rpl_globfree
 #define glob_pattern_p rpl_glob_pattern_p
+#define __glob_pattern_p glob_pattern_p
 
 #define __GLOB_GNULIB 1