asort: Remove constness from ctx pointer.

[ccan] / ccan / asort / asort.h

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 1139238e197d82c269ba5ac972295c6d4a22d5d1..eaaa5b19f418a96a46a951570ad0a9bbf00ed3b0 100644 (file)
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -16,22 +16,16 @@
  * 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))
 
 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 /* CCAN_ASORT_H */