diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-11 08:16:08 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-11 08:16:08 +0300 |
commit | 07815d9555b099482f8877ec700bbc39d1d553dd (patch) | |
tree | 60df9098dabb0a465317135b9a6daabf4152d2e7 /include | |
parent | 940f0c78a4c45536ddede5aaeeebcf36bda53251 (diff) | |
parent | 3c3c4ae22545d3242a8b7c4f2bec3bf2d245890a (diff) | |
download | mariadb-git-07815d9555b099482f8877ec700bbc39d1d553dd.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'include')
-rw-r--r-- | include/my_pthread.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 672bca5ab39..0504a5f3272 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -163,7 +163,7 @@ int pthread_cancel(pthread_t thread); #define pthread_key(T,V) pthread_key_t V #define my_pthread_getspecific_ptr(T,V) my_pthread_getspecific(T,(V)) #define my_pthread_setspecific_ptr(T,V) pthread_setspecific(T,(void*) (V)) -#define pthread_detach_this_thread() { pthread_t tmp=pthread_self() ; pthread_detach(tmp); } +#define pthread_detach_this_thread() #define pthread_handler_t EXTERNC void * typedef void *(* pthread_handler)(void *); |