# HG changeset patch # User Paul Eggert # Date 1074118930 0 # Node ID 14763af928e6efd8891c804c8f544a89af1dd40c # Parent 374463b88e3440f3b8e6c054fc14bc12b061c50a * fnmatch_loop.c (ALLOCA_LIMIT): Remove macro, which collided. diff --git a/lib/ChangeLog b/lib/ChangeLog --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,5 +1,9 @@ 2004-01-14 Paul Eggert + * fnmatch_loop.c (ALLOCA_LIMIT): Remove macro, which collided + with like-named macro in fnmatch.c. + (EXT): Use an internal constant instead. + Merge fnmatch patches from glibc. * fnmatch.c (mbsinit): Remove define. Add libc_hidden_ver (__fnmatch, fnmatch). diff --git a/lib/fnmatch_loop.c b/lib/fnmatch_loop.c --- a/lib/fnmatch_loop.c +++ b/lib/fnmatch_loop.c @@ -1009,6 +1009,7 @@ size_t pattern_len = STRLEN (pattern); const CHAR *p; const CHAR *rs; + enum { ALLOCA_LIMIT = 8000 }; /* Parse the pattern. Store the individual parts in the list. */ level = 0; @@ -1044,7 +1045,6 @@ if (level-- == 0) { /* This means we found the end of the pattern. */ -#define ALLOCA_LIMIT 8000 #define NEW_PATTERN \ struct patternlist *newp; \ size_t plen; \