From 8d116e3f657cb120f79efbbb675fa3cc9d21f53e Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 24 Aug 2017 23:51:07 -0700 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ lib/glob.c | 1 - lib/glob.in.h | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e241c9dc13..994123a6e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-08-24 Paul Eggert + + 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 warnings: fix compilation with old autoconf diff --git a/lib/glob.c b/lib/glob.c index 5a4e884be5..a1e50d7090 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -71,7 +71,6 @@ # define __alloca alloca # endif # define __readdir readdir -# define __glob_pattern_p glob_pattern_p # define COMPILE_GLOB64 #endif /* _LIBC */ diff --git a/lib/glob.in.h b/lib/glob.in.h index 5eb65a0c18..cfb7e49969 100644 --- a/lib/glob.in.h +++ b/lib/glob.in.h @@ -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 -- 2.39.5