1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Include headers for ruby_qsort only if needed

Browse Source 
If GNU `qsort_r` is available, we use the function and these headers
are not used.
This commit is contained in:
Nobuyoshi Nakada 2023-07-14 14:25:37 +09:00
parent ed3d8f74ec
commit cfc564ac40
Notes: git 2023-07-14 09:35:42 +00:00 
Merged: https://github.com/ruby/ruby/pull/8074
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util.c
View File

@ -203,15 +203,15 @@ ruby_strtoul(const char *str, char **endptr, int base)
} }
} }
#if !defined HAVE_GNU_QSORT_R
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <stdint.h>
#ifdef HAVE_UNISTD_H #ifdef HAVE_UNISTD_H
#include <unistd.h> #include <unistd.h>
#endif #endif
typedef int (cmpfunc_t)(const void*, const void*, void*); typedef int (cmpfunc_t)(const void*, const void*, void*);
#if !defined HAVE_GNU_QSORT_R
#if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION #if defined HAVE_QSORT_S && defined RUBY_MSVCRT_VERSION
/* In contrast to its name, Visual Studio qsort_s is incompatible with /* In contrast to its name, Visual Studio qsort_s is incompatible with
* C11 in the order of the comparison function's arguments, and same * C11 in the order of the comparison function's arguments, and same