Commit e108cc77 authored by monty@tik.mysql.fi's avatar monty@tik.mysql.fi

Portability fix

parent b0a0c542
...@@ -146,6 +146,7 @@ int pthread_mutex_destroy (pthread_mutex_t *); ...@@ -146,6 +146,7 @@ int pthread_mutex_destroy (pthread_mutex_t *);
#define pthread_mutex_destroy(A) DeleteCriticalSection(A) #define pthread_mutex_destroy(A) DeleteCriticalSection(A)
#define my_pthread_setprio(A,B) SetThreadPriority(GetCurrentThread(), (B)) #define my_pthread_setprio(A,B) SetThreadPriority(GetCurrentThread(), (B))
#define pthread_kill(A,B) pthread_dummy(0) #define pthread_kill(A,B) pthread_dummy(0)
#define pthread_exit(A) pthread_dummy()
#endif /* OS2 */ #endif /* OS2 */
/* Dummy defines for easier code */ /* Dummy defines for easier code */
......
...@@ -634,9 +634,7 @@ static void __cdecl kill_server(int sig_ptr) ...@@ -634,9 +634,7 @@ static void __cdecl kill_server(int sig_ptr)
unireg_abort(1); /* purecov: inspected */ unireg_abort(1); /* purecov: inspected */
else else
unireg_end(0); unireg_end(0);
#ifndef OS2
pthread_exit(0); /* purecov: deadcode */ pthread_exit(0); /* purecov: deadcode */
#endif
RETURN_FROM_KILL_SERVER; RETURN_FROM_KILL_SERVER;
} }
...@@ -668,9 +666,7 @@ static sig_handler print_signal_warning(int sig) ...@@ -668,9 +666,7 @@ static sig_handler print_signal_warning(int sig)
void unireg_end(int signal_number __attribute__((unused))) void unireg_end(int signal_number __attribute__((unused)))
{ {
clean_up(); clean_up();
#ifndef OS2
pthread_exit(0); // Exit is in main thread pthread_exit(0); // Exit is in main thread
#endif
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment