Skip to content

Commit 58c68a1

Browse files
committed
zstd: synchronize qsort code with upstream
I think we were slightly out of sync with the upstream `dev` branch. I manually copied stanzas referencing qsort and regenerated the monolithic source file. I'm pretty sure the state of our qsort code now agrees with latest upstream. Closes #277. Hopefully.
1 parent 395f693 commit 58c68a1

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

zstd/zstd.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,9 @@
8585
* header and the script 'combine.sh' combines the whole zstd source code
8686
* in a single file.
8787
*/
88-
#if (defined(__linux__) && !defined(__ANDROID__)) || defined(__CYGWIN__) || defined(__MSYS__)
89-
#ifndef _GNU_SOURCE
88+
#if defined(__linux) || defined(__linux__) || defined(linux) || defined(__gnu_linux__) || \
89+
defined(__CYGWIN__) || defined(__MSYS__)
90+
#if !defined(_GNU_SOURCE) && !defined(__ANDROID__) /* NDK doesn't ship qsort_r(). */
9091
#define _GNU_SOURCE
9192
#endif
9293
#endif

0 commit comments

Comments
 (0)