diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-11 08:22:08 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-10-11 08:22:08 +0300 |
| commit | ae9d82c9f872d33e0e439719e4407676d7e1e370 (patch) | |
| tree | 54ee00e6529e0aa701631e1bf47f9d6471878b1f /include | |
| parent | 61b32df93119635570f42a96d0b99c7ea398430b (diff) | |
| parent | 07815d9555b099482f8877ec700bbc39d1d553dd (diff) | |
| download | mariadb-git-ae9d82c9f872d33e0e439719e4407676d7e1e370.tar.gz | |
Merge 10.2 into 10.3
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 c6379047c16..2712c7d8ffd 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -161,7 +161,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 *); |