Two versions of XP_QSORT(), switching Solaris from the libimg version to the xp version

lib/xp/Makefile.in

@@ -38,7 +38,6 @@ CSRCS		= \
 		  xp_intl.c \
 		  xp_ncent.c \
 		  xp_rgb.c \
-		  xp_qsort.c \
 		  xp_str.c \
 		  xp_thrmo.c \
 		  xp_time.c \
@@ -53,6 +52,7 @@ CSRCS =		  xp_stub.c
 endif
 
 CSRCS +=          \
+	xp_qsort.c \
 	xp_file.c \
 	xp_list.c \
 	xp_hash.c \

modules/libimg/src/xpcompat.cpp

@@ -75,9 +75,9 @@ char *XP_GetString(int i)
 }
 
 /* We need this because Solaris' version of qsort is broken and
- * causes array bounds reads.
+ * causes array bounds reads. XXX Moving solaris version to xp/xp_qsort.c
  */
-#if defined(SOLARIS) || defined(XP_MAC)
+#if defined(XP_MAC)
 
 
 /* prototypes for local routines */