blob: 3577a97bf4cca86b461696020f92cc5177052d77 (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
--- src/utils/sort_r.h.orig 2022-02-14 12:24:37 UTC
+++ src/utils/sort_r.h
@@ -25,10 +25,11 @@
#define _SORT_R_INLINE inline
#if ( defined __APPLE__ || defined __MACH__ || defined __DARWIN__ \
- || defined __FreeBSD__ || defined __DragonFly__) && defined IW_HAVE_QSORT_R
+ || (defined __FreeBSD__ && !defined(qsort_r)) || defined __DragonFly__) && defined IW_HAVE_QSORT_R
# define _SORT_R_BSD
#elif ( defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ \
- || defined __linux__ || defined __MINGW32__ || defined __GLIBC__) && defined IW_HAVE_QSORT_R
+ || defined __linux__ || defined __MINGW32__ || defined __GLIBC__ \
+ || (defined (__FreeBSD__) && defined(qsort_r))) && defined IW_HAVE_QSORT_R
# define _SORT_R_LINUX
#elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__)
# define _SORT_R_WINDOWS
@@ -283,7 +284,7 @@ typedef int (*__compar_d_fn_t)(const void*, const void
#if defined _SORT_R_LINUX
typedef int (*__compar_d_fn_t)(const void*, const void*, void*);
-extern void qsort_r(
+extern void (qsort_r)(
void *base, size_t nel, size_t width,
__compar_d_fn_t __compar, void *arg)
__attribute__((nonnull(1, 4)));
|
