* lib/glob.c (GET_LOGIN_NAME_MAX): Renamed from LOGIN_NAME_MAX,

to avoid a collision with bits/local_lim.h in glibc.
All uses changed.  Problem reported by Dmitry V. Levin in
<http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060>.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index ecb3b603ea2814411b60450ce0a853461cfcf16b..091cdc7282e729d9237f330e241cea82c4013b2c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
 2005-09-01  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * glob.c (GET_LOGIN_NAME_MAX): Renamed from LOGIN_NAME_MAX,
+       to avoid a collision with bits/local_lim.h in glibc.
+       All uses changed.  Problem reported by Dmitry V. Levin in
+       <http://sources.redhat.com/bugzilla/show_bug.cgi?id=1060>.
+
        * regex_internal.c (build_wcs_upper_buffer): Fix portability
        bugs in int versus size_t comparisons.
        (re_string_context_at): Fix bug where the code assumed that

diff --git a/lib/glob.c b/lib/glob.c
index 7499c5bfd1e946fe263f5535a55d9029d0e6cd87..f2db01b0b3f1cc3be60dce23f525ad45aa55406f 100644 (file)
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -184,9 +184,9 @@
 # define GETPW_R_SIZE_MAX()    (-1)
 #endif
 #ifdef _SC_LOGIN_NAME_MAX
-# define LOGIN_NAME_MAX()      sysconf (_SC_LOGIN_NAME_MAX)
+# define GET_LOGIN_NAME_MAX()  sysconf (_SC_LOGIN_NAME_MAX)
 #else
-# define LOGIN_NAME_MAX()      (-1)
+# define GET_LOGIN_NAME_MAX()  (-1)
 #endif
 \f
 static const char *next_brace_sub (const char *begin, int flags) __THROW;
@@ -531,7 +531,7 @@ glob (const char *pattern, int flags,
            {
              int success;
              char *name;
-             size_t buflen = LOGIN_NAME_MAX() + 1;
+             size_t buflen = GET_LOGIN_NAME_MAX() + 1;
 
              if (buflen == 0)
                /* `sysconf' does not support _SC_LOGIN_NAME_MAX.  Try