diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-30 17:24:20 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-08-30 17:31:16 +0100 |
| commit | 31edd76313922780fb640f13ad1b5ed130fe442b (patch) | |
| tree | 56f8f8eddbcba74aada0d42b2958f231a2aa0987 /dbus/dbus-threads.c | |
| parent | d98a587f766e00f50244cfa75008e75ee4af20f6 (diff) | |
| download | dbus-31edd76313922780fb640f13ad1b5ed130fe442b.tar.gz | |
Revert "Add a statically-initialized implementation of _dbus_lock() on glibc systems"
This reverts commit 83aaa9f359e90d3b8cae5d17f6d9ba4600cff68b.
This wasn't right: because it looked for a symbol from pthread.h,
modules could end up disagreeing about whether threading was enabled or
not.
Diffstat (limited to 'dbus/dbus-threads.c')
| -rw-r--r-- | dbus/dbus-threads.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c index 45b262dc..12d40493 100644 --- 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 */ /** |