Merge remote-tracking branch 'freedesktop/master'

[platform/upstream/dbus.git] / dbus / dbus-threads.c

diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c
index 45b262d..12d4049 100644 (file)
--- a/dbus/dbus-threads.c
+++ b/dbus/dbus-threads.c
@@ -283,18 +283,6 @@ _dbus_condvar_wake_one (DBusCondVar *cond)
   _dbus_platform_condvar_wake_one (cond);
 }
 
-#ifdef DBUS_HAVE_STATIC_RECURSIVE_MUTEXES
-
-static dbus_bool_t
-init_global_locks (void)
-{
-  return TRUE;
-}
-
-/* implementations in dbus-sysdeps-pthread.c */
-
-#else /* !defined(DBUS_HAVE_STATIC_RECURSIVE_MUTEXES) */
-
 static DBusRMutex *global_locks[_DBUS_N_GLOBAL_LOCKS] = { NULL };
 
 static void
@@ -368,8 +356,6 @@ _dbus_unlock (DBusGlobalLock lock)
   _dbus_platform_rmutex_unlock (global_locks[lock]);
 }
 
-#endif /* !defined(DBUS_HAVE_STATIC_RECURSIVE_MUTEXES) */
-
 /** @} */ /* end of internals */
 
 /**