From 3030dcbd7e233eba4dda80d5a2107b14ea21087c Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Fri, 14 Mar 2003 14:29:21 +0000 Subject: [PATCH] Do not define function g_thread_init_glib, if not G_THREADS_ENABLED. It's 2003-03-14 Sebastian Wilhelmi * glib/gthread.c: Do not define function g_thread_init_glib, if not G_THREADS_ENABLED. It's not called bu g_thread_init() then, but calls other, in that case undefined functions. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-12 | 6 ++++++ ChangeLog.pre-2-4 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ glib/gthread.c | 2 ++ 7 files changed, 38 insertions(+) diff --git a/ChangeLog b/ChangeLog index 3c066e3..af3f9a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-03-14 Sebastian Wilhelmi + + * glib/gthread.c: Do not define function g_thread_init_glib, if + not G_THREADS_ENABLED. It's not called bu g_thread_init() then, + but calls other, in that case undefined functions. + 2003-03-06 Matthias Clasen * glib/gmain.c (g_main_context_find_source_by_id): diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3c066e3..af3f9a2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2003-03-14 Sebastian Wilhelmi + + * glib/gthread.c: Do not define function g_thread_init_glib, if + not G_THREADS_ENABLED. It's not called bu g_thread_init() then, + but calls other, in that case undefined functions. + 2003-03-06 Matthias Clasen * glib/gmain.c (g_main_context_find_source_by_id): diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 3c066e3..af3f9a2 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,9 @@ +2003-03-14 Sebastian Wilhelmi + + * glib/gthread.c: Do not define function g_thread_init_glib, if + not G_THREADS_ENABLED. It's not called bu g_thread_init() then, + but calls other, in that case undefined functions. + 2003-03-06 Matthias Clasen * glib/gmain.c (g_main_context_find_source_by_id): diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3c066e3..af3f9a2 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,9 @@ +2003-03-14 Sebastian Wilhelmi + + * glib/gthread.c: Do not define function g_thread_init_glib, if + not G_THREADS_ENABLED. It's not called bu g_thread_init() then, + but calls other, in that case undefined functions. + 2003-03-06 Matthias Clasen * glib/gmain.c (g_main_context_find_source_by_id): diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3c066e3..af3f9a2 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2003-03-14 Sebastian Wilhelmi + + * glib/gthread.c: Do not define function g_thread_init_glib, if + not G_THREADS_ENABLED. It's not called bu g_thread_init() then, + but calls other, in that case undefined functions. + 2003-03-06 Matthias Clasen * glib/gmain.c (g_main_context_find_source_by_id): diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3c066e3..af3f9a2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2003-03-14 Sebastian Wilhelmi + + * glib/gthread.c: Do not define function g_thread_init_glib, if + not G_THREADS_ENABLED. It's not called bu g_thread_init() then, + but calls other, in that case undefined functions. + 2003-03-06 Matthias Clasen * glib/gmain.c (g_main_context_find_source_by_id): diff --git a/glib/gthread.c b/glib/gthread.c index 2c65d95..20cdf66 100644 --- a/glib/gthread.c +++ b/glib/gthread.c @@ -155,6 +155,7 @@ static GSList *g_thread_free_indeces = NULL; G_LOCK_DEFINE_STATIC (g_thread); +#ifdef G_THREADS_ENABLED /* This must be called only once, before any threads are created. * It will only be called from g_thread_init() in -lgthread. */ @@ -195,6 +196,7 @@ g_thread_init_glib (void) _g_messages_thread_private_init (); } +#endif /* G_THREADS_ENABLED */ void g_static_mutex_init (GStaticMutex *mutex) -- 2.7.4