From c0c0461a2eb7ace0e611cf9b70ab9bdd2fa145e0 Mon Sep 17 00:00:00 2001 From: Landry Breuil Date: Thu, 27 Jul 2017 10:42:22 +0200 Subject: [PATCH] Define inline for all systems, change for Windows to __inline Adapted from upstream commit 1eb3da5945bfb753b56e389379795f1408b152e1 --- lib/sort_r/sort_r.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/sort_r/sort_r.h b/lib/sort_r/sort_r.h index b217703..745fdc6 100644 --- a/lib/sort_r/sort_r.h +++ b/lib/sort_r/sort_r.h @@ -24,16 +24,17 @@ void sort_r(void *base, size_t nel, size_t width, */ +#define _SORT_R_INLINE inline + #if (defined __APPLE__ || defined __MACH__ || defined __DARWIN__ || \ defined __FreeBSD__ || defined __DragonFly__) # define _SORT_R_BSD -# define _SORT_R_INLINE inline #elif (defined _GNU_SOURCE || defined __gnu_hurd__ || defined __GNU__ || \ defined __linux__ || (defined __MINGW32__ && !defined __MINGW64_VERSION_MAJOR) || defined __GLIBC__) # define _SORT_R_LINUX -# define _SORT_R_INLINE inline #elif (defined _WIN32 || defined _WIN64 || defined __WINDOWS__) # define _SORT_R_WINDOWS +# undef _SORT_R_INLINE # define _SORT_R_INLINE __inline #else /* Using our own recursive quicksort sort_r_simple() */