changeset 39793:93a352d6749b

glob: Fix compilation error when glob.h is not replaced. Reported and fix proposed by Reuben Thomas <rrt@sc3d.org> in <https://lists.gnu.org/archive/html/bug-gnulib/2018-08/msg00096.html>. * lib/glob_pattern_p.c: Include <libc-config.h>. * modules/glob (Depends-on): Add libc-config.
author Bruno Haible <bruno@clisp.org>
date Sat, 18 Aug 2018 22:44:28 +0200
parents 3c3833038ff8
children de44beeb728b
files ChangeLog lib/glob_pattern_p.c modules/glob
diffstat 3 files changed, 10 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Sat Aug 18 21:37:03 2018 +0200
+++ b/ChangeLog	Sat Aug 18 22:44:28 2018 +0200
@@ -1,3 +1,11 @@
+2018-08-18  Bruno Haible  <bruno@clisp.org>
+
+	glob: Fix compilation error when glob.h is not replaced.
+	Reported and fix proposed by Reuben Thomas <rrt@sc3d.org> in
+	<https://lists.gnu.org/archive/html/bug-gnulib/2018-08/msg00096.html>.
+	* lib/glob_pattern_p.c: Include <libc-config.h>.
+	* modules/glob (Depends-on): Add libc-config.
+
 2018-08-18  Bruno Haible  <bruno@clisp.org>
 
 	scratch_buffer: Add tests.
--- a/lib/glob_pattern_p.c	Sat Aug 18 21:37:03 2018 +0200
+++ b/lib/glob_pattern_p.c	Sat Aug 18 22:44:28 2018 +0200
@@ -17,7 +17,7 @@
    <https://www.gnu.org/licenses/>.  */
 
 #ifndef _LIBC
-# include <config.h>
+# include <libc-config.h>
 #endif
 
 #include <glob.h>
--- a/modules/glob	Sat Aug 18 21:37:03 2018 +0200
+++ b/modules/glob	Sat Aug 18 22:44:28 2018 +0200
@@ -20,6 +20,7 @@
 flexmember      [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 fnmatch         [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 getlogin_r      [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
+libc-config     [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 memchr          [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 mempcpy         [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]
 opendir         [test $HAVE_GLOB = 0 || test $REPLACE_GLOB = 1]