diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-10-12 00:37:58 +0200 |
| commit | dfb74dea300f83880c11600dc726a9cae559f356 (patch) | |
| tree | 76da0d6e23f188bc13520bf80496e9053f227d9a /include/my_pthread.h | |
| parent | b785857d00a0fd9c98cb52823357bfad8fb18289 (diff) | |
| parent | e7cb032e560e14865941ecdcb553cd3aba856b68 (diff) | |
| download | mariadb-git-dfb74dea300f83880c11600dc726a9cae559f356.tar.gz | |
Merge branch '10.0' into 10.1
Diffstat (limited to 'include/my_pthread.h')
| -rw-r--r-- | include/my_pthread.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/my_pthread.h b/include/my_pthread.h index 104e91715e7..1b7d289b2ef 100644 --- a/include/my_pthread.h +++ b/include/my_pthread.h @@ -701,8 +701,8 @@ extern void my_thread_end(void); extern const char *my_thread_name(void); extern my_thread_id my_thread_dbug_id(void); extern int pthread_dummy(int); -extern void my_mutex_init(); -extern void my_mutex_end(); +extern void my_mutex_init(void); +extern void my_mutex_end(void); /* All thread specific variables are in the following struct */ @@ -745,8 +745,8 @@ struct st_my_thread_var }; extern struct st_my_thread_var *_my_thread_var(void) __attribute__ ((const)); -extern void **my_thread_var_dbug(); -extern safe_mutex_t **my_thread_var_mutex_in_use(); +extern void **my_thread_var_dbug(void); +extern safe_mutex_t **my_thread_var_mutex_in_use(void); extern uint my_thread_end_wait_time; extern my_bool safe_mutex_deadlock_detector; #define my_thread_var (_my_thread_var()) |