diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 08:48:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-28 08:48:36 +0300 |
| commit | a8ded395578ccab9c256b9beee7e62d4ada08522 (patch) | |
| tree | 3560bcda4fc05f41dd8a96df37152802d928a423 /include/my_pthread.h | |
| parent | f7bd369973ae56fe068302f0ff1c4e84d01bff75 (diff) | |
| parent | 3a79e5fd317316c293baa459e8296fdb0744c280 (diff) | |
| download | mariadb-git-a8ded395578ccab9c256b9beee7e62d4ada08522.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index ee4cd15b958..f5bfda49a28 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -298,16 +298,18 @@ void my_pthread_attr_getstacksize(pthread_attr_t *attrib, size_t *size); int my_pthread_mutex_trylock(pthread_mutex_t *mutex); #endif -#if !defined(HAVE_PTHREAD_YIELD_ZERO_ARG) -/* no pthread_yield() available */ #ifdef HAVE_SCHED_YIELD #define pthread_yield() sched_yield() -#elif defined(HAVE_PTHREAD_YIELD_NP) /* can be Mac OS X */ +#else +#if !defined(HAVE_PTHREAD_YIELD_ZERO_ARG) +/* no pthread_yield() available */ +#if defined(HAVE_PTHREAD_YIELD_NP) /* can be Mac OS X */ #define pthread_yield() pthread_yield_np() #elif defined(HAVE_THR_YIELD) #define pthread_yield() thr_yield() -#endif -#endif +#endif //defined(HAVE_PTHREAD_YIELD_NP) +#endif //!defined(HAVE_PTHREAD_YIELD_ZERO_ARG) +#endif //HAVE_SCHED_YIELD size_t my_setstacksize(pthread_attr_t *attr, size_t stacksize); |