Conditionalize thread related calls. (#63091)

2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>

	* glib/gmain.c (g_main_loop_quit): Conditionalize thread related
	calls. (#63091)

diff --git a/ChangeLog b/ChangeLog
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 698d7c23e20fcb85dab662465b0dc3af890007fe..db9c4b59e317711e7c84cb6d9fdd88166fbcb666 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2001-10-29  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_loop_quit): Conditionalize thread related
+       calls. (#63091)
+
 2001-10-28  Tor Lillqvist  <tml@iki.fi>
 
        * glib/glib.def: Add missing g_pattern_match_simple and

diff --git a/glib/gmain.c b/glib/gmain.c
index a965a40cc64edcef3e621b6d184d41a79794c1c2..bc27ca5e893ee0fb0c5de9a40b396c620a93c167 100644 (file)
--- 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);
 }