From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 1 Sep 2005 22:36:04 +0000 (+0000)
Subject: * lib/glob.c (GET_LOGIN_NAME_MAX): Renamed from LOGIN_NAME_MAX,
X-Git-Tag: cvs-readonly~2988
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=1d88fb080ce429327e32ea2d11d74a106a9efc01;p=gnulib.git

* 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 ecb3b603e..091cdc728 100644
--- 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 7499c5bfd..f2db01b0b 100644
--- 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
 
 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