X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fasort%2Fasort.h;h=5024a057cde5d548fe9986dc5e2abc375190cec6;hp=1139238e197d82c269ba5ac972295c6d4a22d5d1;hb=e8c85e38cc6e0094c8d9e286e1706756035b95e0;hpb=009f261242b7e1f5482e097315c82a4185a708bf

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 1139238e..5024a057 100644
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -1,5 +1,6 @@
 #ifndef CCAN_ASORT_H
 #define CCAN_ASORT_H
+#include "config.h"
 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <stdlib.h>
 
@@ -16,22 +17,20 @@
  * The @cmp function should exactly match the type of the @base and
  * @ctx arguments.  Otherwise it can take three const void *.
  */
-#if HAVE_TYPEOF
 #define asort(base, num, cmp, ctx)					\
 _asort((base), (num), sizeof(*(base)),					\
-       cast_if_type((cmp),						\
+       cast_if_type(int (*)(const void *, const void *, void *),	\
+		    (cmp), &*(cmp),					\
 		    int (*)(const __typeof__(*(base)) *,		\
 			    const __typeof__(*(base)) *,		\
-			    __typeof__(ctx)),				\
-		    int (*)(const void *, const void *, const void *)), (ctx))
-#else
-#define asort(base, num, cmp, ctx)				\
-	_asort((base), (num), sizeof(*(base)),			\
-	       (int (*)(const void *, const void *, const void *))(cmp), ctx)
-#endif
+			    __typeof__(ctx))), (ctx))
 
+#if HAVE_QSORT_R_PRIVATE_LAST
+#define _asort(b, n, s, cmp, ctx) qsort_r(b, n, s, cmp, ctx)
+#else
 void _asort(void *base, size_t nmemb, size_t size,
-	    int(*compar)(const void *, const void *, const void *),
-	    const void *ctx);
+	    int(*compar)(const void *, const void *, void *),
+	    void *ctx);
+#endif
 
 #endif /* CCAN_ASORT_H */