Merge branch 'dbus-1.6'

[platform/upstream/dbus.git] / dbus / dbus-threads-internal.h

diff --git a/dbus/dbus-threads-internal.h b/dbus/dbus-threads-internal.h
index 680a603..228a8c0 100644 (file)
--- a/dbus/dbus-threads-internal.h
+++ b/dbus/dbus-threads-internal.h
@@ -32,6 +32,12 @@
  * @{
  */
 
+/* glibc can implement global locks without needing an initialization step,
+ * which improves our thread-safety-by-default further. */
+#if defined(__GLIBC__) && defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP)
+#   define DBUS_HAVE_STATIC_RECURSIVE_MUTEXES 1
+#endif
+
 /**
  * A mutex which is recursive if possible, else non-recursive.
  * This is typically recursive, but that cannot be relied upon.
@@ -66,7 +72,6 @@ dbus_bool_t  _dbus_condvar_wait_timeout      (DBusCondVar       *cond,
                                               DBusCMutex        *mutex,
                                               int                timeout_milliseconds);
 void         _dbus_condvar_wake_one          (DBusCondVar       *cond);
-void         _dbus_condvar_wake_all          (DBusCondVar       *cond);
 void         _dbus_condvar_new_at_location   (DBusCondVar      **location_p);
 void         _dbus_condvar_free_at_location  (DBusCondVar      **location_p);
 
@@ -90,7 +95,6 @@ dbus_bool_t  _dbus_platform_condvar_wait_timeout (DBusCondVar   *cond,
                                               DBusCMutex        *mutex,
                                               int                timeout_milliseconds);
 void         _dbus_platform_condvar_wake_one (DBusCondVar       *cond);
-void         _dbus_platform_condvar_wake_all (DBusCondVar       *cond);
 
 DBUS_END_DECLS