From 15541b4396d3f551ac7fe4efb761ff275a89c4e1 Mon Sep 17 00:00:00 2001 From: Andreas Schlick Date: Sat, 2 Apr 2011 12:00:36 +1030 Subject: [PATCH] asort: Remove the trampoline version. Most Linux systems use glibc and therefore have qsort_r() and for the others an implementation is provided, therefore there is no need to have a third case in asort. --- ccan/asort/asort.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/ccan/asort/asort.c b/ccan/asort/asort.c index f5ed8f86..e7eaf2c2 100644 --- a/ccan/asort/asort.c +++ b/ccan/asort/asort.c @@ -3,21 +3,6 @@ #if !HAVE_QSORT_R_PRIVATE_LAST -#if HAVE_NESTED_FUNCTIONS -void _asort(void *base, size_t nmemb, size_t size, - int(*compar)(const void *, const void *, void *ctx), - void *ctx) -{ - /* This gives bogus "warning: no previous prototype for ‘cmp’" - * with gcc 4 with -Wmissing-prototypes. Hence the auto crap. */ - auto int cmp(const void *a, const void *b); - int cmp(const void *a, const void *b) - { - return compar(a, b, ctx); - } - qsort(base, nmemb, size, cmp); -} -#else /* Steal glibc's code. */ /* Copyright (C) 1991,1992,1996,1997,1999,2004 Free Software Foundation, Inc. @@ -270,6 +255,5 @@ _asort (void *const pbase, size_t total_elems, size_t size, } } } -#endif /* !HAVE_NESTED_FUNCTIONS */ #endif /* !HAVE_QSORT_R_PRIVATE_LAST */ -- 2.39.2