Reverting back to 3.1

include/xp_qsort.h

@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-#if defined(BROKEN_QSORT) || !defined(HAVE_QSORT)
+#if defined(SOLARIS) || defined(XP_MAC)
 extern void XP_QSORT(void *, size_t, size_t,
                      int (*)(const void *, const void *));
 #elif defined(XP_OS2)