summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--dbus/dbus-connection-internal.h6
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a8f00bfa..adec6ca0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-09-07 John (J5) Palmieri <johnp@redhat.com>
+ * dbus/dbus-connection-internal.h: Add prototype for
+ _dbus_connection_test_get_locks to remove warning
+
+2006-09-07 John (J5) Palmieri <johnp@redhat.com>
+
* dbus/dbus-spawn.c (_dbus_spawn_async_with_babysitter): Make sure we
close child_err_report_pipe[WRITE_END] on exec (Patch from
Kimmo Hämäläinen <kimmo dot hamalainen at nokia dot com>)
diff --git a/dbus/dbus-connection-internal.h b/dbus/dbus-connection-internal.h
index 4506f634..6f42e168 100644
--- a/dbus/dbus-connection-internal.h
+++ b/dbus/dbus-connection-internal.h
@@ -94,6 +94,12 @@ dbus_bool_t _dbus_connection_send_and_unlock (DBusConnection
void _dbus_connection_queue_synthesized_message_link (DBusConnection *connection,
DBusList *link);
+void _dbus_connection_test_get_locks (DBusConnection *conn,
+ DBusMutex **mutex_loc,
+ DBusMutex **dispatch_mutex_loc,
+ DBusMutex **io_path_mutex_loc,
+ DBusCondVar **dispatch_cond_loc,
+ DBusCondVar **io_path_cond_loc);
DBUS_END_DECLS