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

[pspp] / lib / glob.c

diff --git a/lib/glob.c b/lib/glob.c
index fe0e8d58febdeb1a95b5f08a8f3ba4014019ebe0..28ca8a06b09d75d54856966e187b11b90546a3c3 100644 (file)
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -34,13 +34,10 @@
 #include <stdio.h>             /* Needed on stupid SunOS for assert.  */
 
 #if !defined _LIBC || !defined GLOB_ONLY_P
-#if defined HAVE_UNISTD_H || defined _LIBC
-# include <unistd.h>
-# ifndef POSIX
-#  ifdef _POSIX_VERSION
-#   define POSIX
-#  endif
-# endif
+
+#include <unistd.h>
+#if !defined POSIX && defined _POSIX_VERSION
+# define POSIX
 #endif
 
 #include <pwd.h>
@@ -912,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;