From: Paul Eggert Date: Wed, 6 Sep 2017 01:58:50 +0000 (-0700) Subject: glob: fix for use in glibc X-Git-Tag: v1.0~5958 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=ef5de27602b0dfe288e21e925e2b8a09babdb41d;p=gnulib.git glob: fix for use in glibc Problem reported by Adhemerval Zanella in: https://sourceware.org/ml/libc-alpha/2017-09/msg00213.html * lib/glob.c (DT_UNKNOWN, DT_DIR, DT_LINK): Do not redefine if _LIBC. --- diff --git a/ChangeLog b/ChangeLog index 351495b2f1..61e3e8cd11 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2017-09-05 Paul Eggert + + glob: fix for use in glibc + Problem reported by Adhemerval Zanella in: + https://sourceware.org/ml/libc-alpha/2017-09/msg00213.html + * lib/glob.c (DT_UNKNOWN, DT_DIR, DT_LINK): + Do not redefine if _LIBC. + 2017-09-02 Paul Eggert glob: fix bugs with long login names diff --git a/lib/glob.c b/lib/glob.c index 8eb2b97302..ddab535767 100644 --- a/lib/glob.c +++ b/lib/glob.c @@ -80,7 +80,7 @@ static const char *next_brace_sub (const char *begin, int flags) __THROWNL; typedef uint_fast8_t dirent_type; -#ifndef HAVE_STRUCT_DIRENT_D_TYPE +#if !defined _LIBC && !defined HAVE_STRUCT_DIRENT_D_TYPE /* Any distinct values will do here. Undef any existing macros out of the way. */ # undef DT_UNKNOWN