Merge g_thread_functions_for_glib_use

Move the now-identical copies of g_thread_functions_for_glib_use from
gthread-{posix,win32}.c back into gthread.c.

diff --git a/glib/gthread-posix.c b/glib/gthread-posix.c
index af53ae2..01bd092 100644 (file)
--- a/glib/gthread-posix.c
+++ b/glib/gthread-posix.c
@@ -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: */

diff --git a/glib/gthread-win32.c b/glib/gthread-win32.c
index 7f8fb4f..2ed1d92 100644 (file)
--- a/glib/gthread-win32.c
+++ b/glib/gthread-win32.c
@@ -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)
 {

diff --git a/glib/gthread.c b/glib/gthread.c
index 9b50dfd..22f2fe2 100644 (file)
--- a/glib/gthread.c
+++ b/glib/gthread.c
@@ -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,
+};