luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-07 19:35:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the right conditional (G_THREADS_ENABLED instead of G_THREAD_ENABLED).

Browse Source 
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)
This commit is contained in:
Sebastian Wilhelmi 2001-10-31 13:49:53 +00:00 committed by Sebastian Wilhelmi
parent eb17b20bd2
commit 5cdbc63e47
9 changed files with 80 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -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.

9
ChangeLog.pre-2-0
View File

@ -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.

9
ChangeLog.pre-2-10
View File

@ -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.

9
ChangeLog.pre-2-12
View File

@ -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.

9
ChangeLog.pre-2-2
View File

@ -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.

9
ChangeLog.pre-2-4
View File

@ -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.

9
ChangeLog.pre-2-6
View File

@ -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.

9
ChangeLog.pre-2-8
View File

@ -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.

18
glib/gmain.c
View File

@ -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 */
}
/**