diff lib-src/sorted-doc.c @ 442:abe6d1db359e r21-2-36

Import from CVS: tag r21-2-36
author cvs
date Mon, 13 Aug 2007 11:35:02 +0200
parents 8de8e3f6228a
children 023b83f4e54b
line wrap: on
line diff
--- a/lib-src/sorted-doc.c	Mon Aug 13 11:33:40 2007 +0200
+++ b/lib-src/sorted-doc.c	Mon Aug 13 11:35:02 2007 +0200
@@ -14,9 +14,6 @@
 #include <stdlib.h> /* for qsort() and malloc() */
 #include <string.h>
 static void *xmalloc (size_t);
-#ifndef CONST
-# define CONST const
-#endif
 
 #define NUL	'\0'
 #define MARKER '\037'
@@ -96,7 +93,7 @@
   WAITING, BEG_NAME, NAME_GET, BEG_DESC, DESC_GET
 };
 
-CONST char *states[] =
+const char *states[] =
 {
   "WAITING", "BEG_NAME", "NAME_GET", "BEG_DESC", "DESC_GET"
 };
@@ -201,12 +198,7 @@
     /* sort the array by name; within each name, by type */
 
     qsort ((char*)array, cnt, sizeof (DOCSTR*),
-	   /* was cast to (int (*)(CONST void *, CONST void *))
-	      but that loses on HP because CONST_IS_LOSING. */
-	   /* This one loses too: (int (*)()) */
-	   /* Ok, so let's try const instead of CONST.  Fuck me!!! */
-	   (int (*)(const void *, const void *))
-	   cmpdoc);
+	   (int (*)(const void *, const void *)) cmpdoc);
 
     /* write the output header */