kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

util.c: fix ruby_qsort with qsort_s

Browse source 
* util.c (ruby_qsort): __STDC_VERSION__ may not be defined even if it
  is available.  fixed duplicate definitions when qsort_s is available
  on non-Windows platforms.  [ruby-core:88921] [Bug #15091]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64671 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-09-10 04:21:39 +00:00
parent 5679d0c5c2
commit ef92aa9a45
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
util.c
View file

@ -197,27 +197,13 @@ ruby_strtoul(const char *str, char **endptr, int base)
typedef int (cmpfunc_t)(const void*, const void*, void*);
#if defined HAVE_QSORT_S
# if 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
* C11 in the order of the comparison function's arguments, and same
* as BSD qsort_r rather. */
# define qsort_r(base, nel, size, arg, cmp) qsort_s(base, nel, size, cmp, arg)
# define cmp_bsd_qsort cmp_ms_qsort
# define HAVE_BSD_QSORT_R 1
# elif defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L
/* C11 qsort_s has the same arguments as ours */
void
ruby_qsort(void* base, const size_t nel, const size_t size, cmpfunc_t *cmp, void *d)
{
if (!nel || !size) return; /* nothing to sort */
/* get rid of runtime-constraints handler for MT-safeness */
if (!base || !cmp) return;
if (nel > RSIZE_MAX || size > RSIZE_MAX) return;
qsort_s(base, nel, size, cmp, d);
}
# else
# error Unknown version qsort_s
# endif
#endif
#if defined HAVE_BSD_QSORT_R
@ -241,6 +227,22 @@ ruby_qsort(void* base, const size_t nel, const size_t size, cmpfunc_t *cmp, void
args.arg = d;
qsort_r(base, nel, size, &args, cmp_bsd_qsort);
}
#elif defined HAVE_QSORT_S
/* C11 qsort_s has the same arguments as GNU's, but uses
* runtime-constraints handler. */
void
ruby_qsort(void* base, const size_t nel, const size_t size, cmpfunc_t *cmp, void *d)
{
if (!nel || !size) return; /* nothing to sort */
/* get rid of runtime-constraints handler for MT-safeness */
if (!base || !cmp) return;
if (nel > RSIZE_MAX || size > RSIZE_MAX) return;
qsort_s(base, nel, size, cmp, d);
}
# define HAVE_GNU_QSORT_R 1
# endif
#elif !defined HAVE_GNU_QSORT_R
/* mm.c */