* fnmatch_loop.c (ALLOCA_LIMIT): Remove macro, which collided.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 8815c11..9110532 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,9 @@
 2004-01-14  Paul Eggert  <eggert@twinsun.com>
 
+       * 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
index 8d7f2fa..7798b59 100644 (file)
--- a/lib/fnmatch_loop.c
+++ b/lib/fnmatch_loop.c
@@ -1009,6 +1009,7 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
   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 @@ EXT (INT opt, const CHAR *pattern, const CHAR *string, const CHAR *string_end,
        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;                                                      \