From 7f7a422ce55725b312030cbe05e8fa4236583483 Mon Sep 17 00:00:00 2001 From: Sebastian Wilhelmi Date: Mon, 29 Oct 2001 11:09:53 +0000 Subject: [PATCH] Conditionalize thread related calls. (#63091) 2001-10-29 Sebastian Wilhelmi * glib/gmain.c (g_main_loop_quit): Conditionalize thread related calls. (#63091) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-12 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ glib/gmain.c | 3 +++ 9 files changed, 43 insertions(+) diff --git a/ChangeLog b/ChangeLog index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 698d7c23e..db9c4b59e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-10-29 Sebastian Wilhelmi + + * glib/gmain.c (g_main_loop_quit): Conditionalize thread related + calls. (#63091) + 2001-10-28 Tor Lillqvist * glib/glib.def: Add missing g_pattern_match_simple and diff --git a/glib/gmain.c b/glib/gmain.c index a965a40cc..bc27ca5e8 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -2475,8 +2475,11 @@ g_main_loop_quit (GMainLoop *loop) loop->is_running = FALSE; g_main_context_wakeup_unlocked (loop->context); +#ifdef G_THREADS_ENABLED if (loop->context->cond) g_cond_broadcast (loop->context->cond); +#endif /* G_THREADS_ENABLED */ + UNLOCK_CONTEXT (loop->context); }