From 2f01632cee950e72fffb07fa5d9e9604feafbbcb Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 5 Mar 2015 21:32:10 +0100 Subject: [PATCH] Revert partially DBusSocket refactoring, it is not appliable (to be merged into the main patch) --- dbus/dbus-transport-socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dbus/dbus-transport-socket.c b/dbus/dbus-transport-socket.c index 518395a..da635fd 100644 --- a/dbus/dbus-transport-socket.c +++ b/dbus/dbus-transport-socket.c @@ -604,7 +604,7 @@ do_writing (DBusTransport *transport) if (socket_transport->message_bytes_written <= 0 && DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport)) { /* Send the fds along with the first byte of the message */ - const DBusSocket *unix_fds; + const int *unix_fds; unsigned n; _dbus_message_get_unix_fds(message, &unix_fds, &n); @@ -821,7 +821,7 @@ do_reading (DBusTransport *transport) #ifdef HAVE_UNIX_FD_PASSING if (DBUS_TRANSPORT_CAN_SEND_UNIX_FD(transport)) { - DBusSocket *fds; + int *fds; int n_fds; if (!_dbus_message_loader_get_unix_fds(transport->loader, &fds, &n_fds)) -- 1.8.4.5