ttxml: removed cruft from tests

[ccan] / ccan / asort / asort.h

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 5024a057cde5d548fe9986dc5e2abc375190cec6..3506c2ae01640530c9187b26a9b3e49021b80d44 100644 (file)
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -1,3 +1,4 @@
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */
 #ifndef CCAN_ASORT_H
 #define CCAN_ASORT_H
 #include "config.h"
@@ -19,11 +20,12 @@
  */
 #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)