luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-04 16:36:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge g_thread_functions_for_glib_use

Browse Source 
Move the now-identical copies of g_thread_functions_for_glib_use from
gthread-{posix,win32}.c back into gthread.c.
This commit is contained in:
Ryan Lortie 2011-09-19 00:03:40 -04:00
parent 6ea1721191
commit 6972ed340b
3 changed files with 25 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glib/gthread-posix.c
View File

@ -585,29 +585,4 @@ g_system_thread_equal (gpointer thread1,
}
/* {{{1 Epilogue */
GThreadFunctions g_thread_functions_for_glib_use =
{
g_mutex_new,
g_mutex_lock,
g_mutex_trylock,
g_mutex_unlock,
g_mutex_free,
g_cond_new,
g_cond_signal,
g_cond_broadcast,
g_cond_wait,
g_cond_timed_wait,
g_cond_free,
g_private_new,
g_private_get,
g_private_set,
NULL,
g_thread_yield,
NULL,
NULL,
NULL,
NULL,
NULL,
};
/* vim:set foldmethod=marker: */

25
glib/gthread-win32.c
View File

@ -752,31 +752,6 @@ g_thread_xp_init (void)
/* {{{1 Epilogue */
GThreadFunctions g_thread_functions_for_glib_use =
{
g_mutex_new, /* mutex */
g_mutex_lock,
g_mutex_trylock,
g_mutex_unlock,
g_mutex_free,
g_cond_new, /* condition */
g_cond_signal,
g_cond_broadcast,
g_cond_wait,
g_cond_timed_wait,
g_cond_free,
g_private_new, /* private thread data */
g_private_get,
g_private_set,
NULL, /* thread */
g_thread_yield,
NULL,
NULL,
NULL,
NULL,
NULL
};
void
_g_thread_impl_init (void)
{

25
glib/gthread.c
View File

@ -2425,3 +2425,28 @@ g_private_new (GDestroyNotify notify)
return key;
}
GThreadFunctions g_thread_functions_for_glib_use =
{
g_mutex_new,
g_mutex_lock,
g_mutex_trylock,
g_mutex_unlock,
g_mutex_free,
g_cond_new,
g_cond_signal,
g_cond_broadcast,
g_cond_wait,
g_cond_timed_wait,
g_cond_free,
g_private_new,
g_private_get,
g_private_set,
NULL,
g_thread_yield,
NULL,
NULL,
NULL,
NULL,
NULL,
};