base64: fix for unsigned chars (e.g. ARM).

[ccan] / ccan / asort / asort.h

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 731f9bde4cc1e868bec846c19dff1b7502fc204b..43b0f89c3c6b8e3bd28686c2cf909b5515a908f0 100644 (file)
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -1,6 +1,8 @@
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #ifndef CCAN_ASORT_H
 #define CCAN_ASORT_H
-#include <ccan/typesafe_cb/typesafe_cb.h>
+#include "config.h"
+#include <ccan/order/order.h>
 #include <stdlib.h>
 
 /**
@@ -18,14 +20,13 @@
  */
 #define asort(base, num, cmp, ctx)                                     \
 _asort((base), (num), sizeof(*(base)),                                 \
-       cast_if_type(int (*)(const void *, const void *, const void *), \
-                   (cmp), &*(cmp),                                     \
-                   int (*)(const __typeof__(*(base)) *,                \
-                           const __typeof__(*(base)) *,                \
-                           __typeof__(ctx))), (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 *, const void *),
-           const void *ctx);
+           _total_order_cb compar, void *ctx);
+#endif
 
 #endif /* CCAN_ASORT_H */