Commit 15541b43 authored by Andreas Schlick's avatar Andreas Schlick Committed by Rusty Russell

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.
parent 9660f0f1
......@@ -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 */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment