* glob.c (collated_compare): Remove 'const' uses that weren't needed.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 82fa69427b28eba32b9991288e26c0fd7166271c..8ea50832eb31b260797b34c1c02e1baf6f2c1def 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2006-06-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * glob.c (collated_compare): Remove 'const' uses that weren't needed.
+       Some compiler complained about some of them.  Problem reported by
+       Larry Jones in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2006-06/msg00172.html>.
+
 2006-06-21  Simon Josefsson  <jas@extundo.com>
 
        * getaddrinfo.c (getaddrinfo): Set ai_family in the return

diff --git a/lib/glob.c b/lib/glob.c
index 265377e799951cd545a39187f33444242d238dea..28ca8a06b09d75d54856966e187b11b90546a3c3 100644 (file)
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -909,8 +909,8 @@ libc_hidden_def (globfree)
 static int
 collated_compare (const void *a, const void *b)
 {
-  const char *const s1 = *(const char *const * const) a;
-  const char *const s2 = *(const char *const * const) b;
+  char *const *ps1 = a; char *s1 = *ps1;
+  char *const *ps2 = b; char *s2 = *ps2;
 
   if (s1 == s2)
     return 0;