# HG changeset patch # User Mike Becker # Date 1565205608 -7200 # Node ID 1a9c112f4116cd3d73bf112a11593efb1a78af08 # Parent 6089eb30a51a3e4c9527be09faff58e6218db9de fixes #ifdefs to be sure no redefine can ever happen diff -r 6089eb30a51a -r 1a9c112f4116 src/array.c --- a/src/array.c Wed Aug 07 21:14:58 2019 +0200 +++ b/src/array.c Wed Aug 07 21:20:08 2019 +0200 @@ -35,16 +35,14 @@ #include #ifndef UCX_ARRAY_DISABLE_QSORT -#if defined(__GLIBC__) +#ifdef __GLIBC__ #if __GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 8) #define ucx_array_sort_impl qsort_r #endif /* glibc version >= 2.8 */ -#endif /* __GLIBC__ */ - -#if defined(__APPLE__) || defined(__FreeBSD__) +#elif /* not __GLIBC__ */ defined(__APPLE__) || defined(__FreeBSD__) #define ucx_array_sort_impl ucx_qsort_r #define USE_UCX_QSORT_R -#endif /* __APLE__ or __FreeBSD__ */ +#endif /* __GLIBC__, __APLE__, __FreeBSD__ */ #endif /* UCX_ARRAY_DISABLE_QSORT */ #ifndef ucx_array_sort_impl