X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=ccan%2Fasort%2Fasort.h;h=43b0f89c3c6b8e3bd28686c2cf909b5515a908f0;hp=3506c2ae01640530c9187b26a9b3e49021b80d44;hb=HEAD;hpb=74257cee33ae3033f961d5f22a0313b8cb1b18d4

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 3506c2ae..43b0f89c 100644
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -2,7 +2,7 @@
 #ifndef CCAN_ASORT_H
 #define CCAN_ASORT_H
 #include "config.h"
-#include <ccan/typesafe_cb/typesafe_cb.h>
+#include <ccan/order/order.h>
 #include <stdlib.h>
 
 /**
@@ -20,19 +20,13 @@
  */
 #define asort(base, num, cmp, ctx)					\
 _asort((base), (num), sizeof(*(base)),					\
-       typesafe_cb_cast(int (*)(const void *, const void *, void *),	\
-			int (*)(const __typeof__(*(base)) *,		\
-				const __typeof__(*(base)) *,		\
-				__typeof__(ctx)),			\
-			(cmp)),						\
-       (ctx))
+       total_order_cast((cmp), *(base), (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 *, void *),
-	    void *ctx);
+	    _total_order_cb compar, void *ctx);
 #endif
 
 #endif /* CCAN_ASORT_H */