From f33cc84dd4af7776309d118412df008ec4108a57 Mon Sep 17 00:00:00 2001 From: Michael Tokarev Date: Fri, 2 May 2014 18:35:55 +0400 Subject: do not call g_thread_init() for glib >= 2.31 glib >= 2.31 always enables thread support and g_thread_supported() is #defined to 1, there's no need to call g_thread_init() anymore, and it definitely does not need to report error which never happens. Keep code for old < 2.31 glibc anyway for now, just #ifdef it differently. Signed-off-by: Michael Tokarev Reviewed-by: Stefan Hajnoczi Cc: qemu-trivial@nongnu.org --- coroutine-gthread.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'coroutine-gthread.c') diff --git a/coroutine-gthread.c b/coroutine-gthread.c index d3e5b991f7..a61efe01dc 100644 --- a/coroutine-gthread.c +++ b/coroutine-gthread.c @@ -115,14 +115,11 @@ static inline GThread *create_thread(GThreadFunc func, gpointer data) static void __attribute__((constructor)) coroutine_init(void) { - if (!g_thread_supported()) { #if !GLIB_CHECK_VERSION(2, 31, 0) + if (!g_thread_supported()) { g_thread_init(NULL); -#else - fprintf(stderr, "glib threading failed to initialize.\n"); - exit(1); -#endif } +#endif init_coroutine_cond(); } -- cgit v1.2.3