* dbus/dbus-threads.c: Allow recursive mutex's to be passed into

  dbus_threads_init and be used by the dbus mutex functions to
  avoid deadlocks.

* doc/TODO: Remove recursive mutex dbus_connection_dispatch TODO item

1 files changed, 2 insertions, 2 deletions

diff --git a/dbus/dbus-threads-internal.h b/dbus/dbus-threads-internal.h
index 700c4f75..8f26bca1 100644
--- a/dbus/dbus-threads-internal.h
+++ b/dbus/dbus-threads-internal.h
@@ -31,8 +31,8 @@ DBUS_BEGIN_DECLS
 
 DBusMutex*   _dbus_mutex_new                 (void);
 void         _dbus_mutex_free                (DBusMutex         *mutex);
-dbus_bool_t  _dbus_mutex_lock                (DBusMutex         *mutex);
-dbus_bool_t  _dbus_mutex_unlock              (DBusMutex         *mutex);
+void         _dbus_mutex_lock                (DBusMutex         *mutex);
+void         _dbus_mutex_unlock              (DBusMutex         *mutex);
 void         _dbus_mutex_new_at_location     (DBusMutex        **location_p);
 void         _dbus_mutex_free_at_location    (DBusMutex        **location_p);