typesafe_cb: simplify, preserve namespace.

[ccan] / ccan / asort / asort.h

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index eaaa5b19f418a96a46a951570ad0a9bbf00ed3b0..b7178c5b1d50c1d8f08f8c63ebe8953b042fd42c 100644 (file)
--- 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>
 
@@ -18,14 +19,19 @@
  */
 #define asort(base, num, cmp, ctx)                                     \
 _asort((base), (num), sizeof(*(base)),                                 \
-       cast_if_type(int (*)(const void *, const void *, void *),       \
-                   (cmp), &*(cmp),                                     \
-                   int (*)(const __typeof__(*(base)) *,                \
-                           const __typeof__(*(base)) *,                \
-                           __typeof__(ctx))), (ctx))
+       typesafe_cb_cast(int (*)(const void *, const void *, void *),   \
+                       int (*)(const __typeof__(*(base)) *,            \
+                               const __typeof__(*(base)) *,            \
+                               __typeof__(ctx)),                       \
+                       (cmp)),                                         \
+       (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 *, void *),
            void *ctx);
+#endif
 
 #endif /* CCAN_ASORT_H */