summaryrefslogtreecommitdiff
path: root/gthread
diff options
context:
space:
mode:
authorRyan Lortie <desrt@desrt.ca>2011-09-09 13:20:40 -0400
committerRyan Lortie <desrt@desrt.ca>2011-09-09 13:23:48 -0400
commit413186a962973cff5dfbee66ef920016f4cb5c2d (patch)
tree8607eb6f14570727fa8e8c2119c58613834b05be /gthread
parent80109acef586a5a1d34f604414a36e7e18b0cede (diff)
emufutex: remove init from g_thread_init_glib
Use a GStaticMutex instead.
Diffstat (limited to 'gthread')
-rw-r--r--gthread/tests/1bit-mutex.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/gthread/tests/1bit-mutex.c b/gthread/tests/1bit-mutex.c
index 0bfce91f0..c5377564a 100644
--- a/gthread/tests/1bit-mutex.c
+++ b/gthread/tests/1bit-mutex.c
@@ -42,7 +42,6 @@
#define g_pointer_bit_lock _emufutex_g_pointer_bit_lock
#define g_pointer_bit_trylock _emufutex_g_pointer_bit_trylock
#define g_pointer_bit_unlock _emufutex_g_pointer_bit_unlock
- #define _g_futex_thread_init _emufutex_g_futex_thread_init
#define G_BIT_LOCK_FORCE_FUTEX_EMULATION
@@ -121,13 +120,12 @@ testcase (gconstpointer data)
g_thread_init (NULL);
#ifdef TEST_EMULATED_FUTEX
- _g_futex_thread_init ();
#define SUFFIX "-emufutex"
/* ensure that we are using the emulated futex by checking
- * (at compile-time) for the existance of 'g_futex_mutex'
+ * (at compile-time) for the existance of 'g_futex_address_list'
*/
- g_assert (g_futex_mutex != NULL);
+ g_assert (g_futex_address_list == NULL);
#else
#define SUFFIX ""
#endif