tdb2: copy tdb1's changed expansion logic.

[ccan] / ccan / asort / asort.h

diff --git a/ccan/asort/asort.h b/ccan/asort/asort.h
index 1139238e197d82c269ba5ac972295c6d4a22d5d1..3506c2ae01640530c9187b26a9b3e49021b80d44 100644 (file)
--- a/ccan/asort/asort.h
+++ b/ccan/asort/asort.h
@@ -1,5 +1,7 @@
+/* Licensed under LGPLv2.1+ - see LICENSE file for details */

 #ifndef CCAN_ASORT_H
 #define CCAN_ASORT_H
 #ifndef CCAN_ASORT_H
 #define CCAN_ASORT_H

+#include "config.h"

 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <stdlib.h>
 
 #include <ccan/typesafe_cb/typesafe_cb.h>
 #include <stdlib.h>
 


@@ -16,22 +18,21 @@
  * 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),                                             \
-                   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
+       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)
+#else

 void _asort(void *base, size_t nmemb, size_t size,
 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

 
 #endif /* CCAN_ASORT_H */
 
 #endif /* CCAN_ASORT_H */