Use the right conditional (G_THREADS_ENABLED instead of G_THREAD_ENABLED).

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

	* glib/gmain.c (g_main_context_acquire, g_main_context_release,
	g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
	instead of G_THREAD_ENABLED). Also remove wrong
	return-statement. Unfortunately mainloop-test still does fail. Many
	thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
	this. (#63455)

diff --git a/ChangeLog b/ChangeLog
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 1bc6d80..962fc99 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2001-10-31  Sebastian Wilhelmi  <wilhelmi@ira.uka.de>
+
+       * glib/gmain.c (g_main_context_acquire, g_main_context_release,
+       g_main_context_wait): Use the right conditional (G_THREADS_ENABLED
+       instead of G_THREAD_ENABLED). Also remove wrong
+       return-statement. Unfortunately mainloop-test still does fail. Many
+       thanks to Andrea Fazekas <fazek@ludens.elte.hu> for spotting
+       this. (#63455)
+
 2001-10-31  Matthias Clasen  <matthiasc@poet.de>
 
        * gobject/gsourceclosure.c (g_source_set_closure): Fix documentation.

diff --git a/glib/gmain.c b/glib/gmain.c
index bc27ca5..1103ffa 100644 (file)
--- a/glib/gmain.c
+++ b/glib/gmain.c
@@ -1685,7 +1685,7 @@ next_valid_source (GMainContext *context,
 gboolean 
 g_main_context_acquire (GMainContext *context)
 {
-#ifdef G_THREAD_ENABLED
+#ifdef G_THREADS_ENABLED
   gboolean result = FALSE;
   GThread *self = G_THREAD_SELF;
 
@@ -1709,9 +1709,9 @@ g_main_context_acquire (GMainContext *context)
   UNLOCK_CONTEXT (context); 
   
   return result;
-#else /* !G_THREAD_ENABLED */
+#else /* !G_THREADS_ENABLED */
   return TRUE;
-#endif /* G_THREAD_ENABLED */
+#endif /* G_THREADS_ENABLED */
 }
 
 /**
@@ -1726,7 +1726,7 @@ g_main_context_acquire (GMainContext *context)
 void
 g_main_context_release (GMainContext *context)
 {
-#ifdef G_THREAD_ENABLED
+#ifdef G_THREADS_ENABLED
   if (context == NULL)
     context = g_main_context_default ();
   
@@ -1755,9 +1755,7 @@ g_main_context_release (GMainContext *context)
     }
 
   UNLOCK_CONTEXT (context); 
-
-  return result;
-#endif /* G_THREAD_ENABLED */
+#endif /* G_THREADS_ENABLED */
 }
 
 /**
@@ -1781,7 +1779,7 @@ g_main_context_wait (GMainContext *context,
                     GCond        *cond,
                     GMutex       *mutex)
 {
-#ifdef G_THREAD_ENABLED
+#ifdef G_THREADS_ENABLED
   gboolean result = FALSE;
   GThread *self = G_THREAD_SELF;
   gboolean loop_internal_waiter;
@@ -1828,9 +1826,9 @@ g_main_context_wait (GMainContext *context,
     UNLOCK_CONTEXT (context); 
   
   return result;
-#else /* !G_THREAD_ENABLED */
+#else /* !G_THREADS_ENABLED */
   return TRUE;
-#endif /* G_THREAD_ENABLED */
+#endif /* G_THREADS_ENABLED */
 }
 
 /**