typesafe_cb, hashtable: revise typesafe_cb arg order, neaten.

[ccan] / ccan / asort / asort.h

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 1139238e197d82c269ba5ac972295c6d4a22d5d1..ffef1f6fe9e394b9697812982cfd46e964436e4f 100644 (file)
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -16,19 +16,13 @@
  * The @cmp function should exactly match the type of the @base and
  * @ctx arguments.  Otherwise it can take three const void *.
  */
  * 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)),                                 \
 #define asort(base, num, cmp, ctx)                                     \
 _asort((base), (num), sizeof(*(base)),                                 \

-       cast_if_type((cmp),                                             \
+       cast_if_type(int (*)(const void *, const void *, const void *), \
+                   (cmp),                                              \

                    int (*)(const __typeof__(*(base)) *,                \
                            const __typeof__(*(base)) *,                \
                    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 *),
 
 void _asort(void *base, size_t nmemb, size_t size,
            int(*compar)(const void *, const void *, const void *),