stv0g/tvheadend
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #407 from dmarion/osx

Browse source 
osx: fix crash during the tvh_qsort_r()
This commit is contained in:
perexg 2014-05-30 08:23:46 +02:00
commit 3f6326fc3f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/wrappers.c
View file

@ -172,7 +172,7 @@ qsort_r(void *base, size_t nmemb, size_t size,
#endif /* ENABLE_QSORT_R */
#if defined(PLATFORM_FREEBSD)
#if defined(PLATFORM_FREEBSD) || defined(PLATFORM_DARWIN)
struct tvh_qsort_data {
void *arg;
int (*compar)(const void *, const void *, void *);
@ -185,13 +185,13 @@ tvh_qsort_swap(void *arg, const void *a, const void *b)
struct tvh_qsort_data *data = arg;
return data->compar(a, b, data->arg);
}
#endif /* PLATFORM_FREEBSD */
#endif /* PLATFORM_FREEBSD || PLATFORM_DARWIN */
void
tvh_qsort_r(void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *, void *), void *arg)
{
#if defined(PLATFORM_FREEBSD)
#if defined(PLATFORM_FREEBSD) || defined(PLATFORM_DARWIN)
struct tvh_qsort_data swap_arg = {arg, compar};
qsort_r(base, nmemb, size, &swap_arg, tvh_qsort_swap);
#else