summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2007-05-24 17:28:42 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2007-05-24 17:28:42 +0000
commit1e6025ef4ffc8ecde6b35104549132d890aa260a (patch)
tree479c365134022f1ae6e759b390e587f1ab19edfa
parent5bd59d4a6c4d25f2cff6bcb45de647e09cf682cd (diff)
* dbus/dbus-sysdeps-win.c (_dbus_full_duplex_pipe): fixed assertation.
-rw-r--r--ChangeLog4
-rw-r--r--dbus/dbus-sysdeps-win.c3
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 77a29e93..82638f3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-25 Ralf Habacker <ralf.habacker@freenet.de>
+
+ * dbus/dbus-sysdeps-win.c (_dbus_full_duplex_pipe): fixed assertation.
+
2007-05-24 Simon McVittie <simon.mcvittie@collabora.co.uk>
* bus/config-parser.c (test_service_dir_matches): fixed ordering for unix.
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index f8c4dfd4..095fdd6f 100644
--- a/dbus/dbus-sysdeps-win.c
+++ b/dbus/dbus-sysdeps-win.c
@@ -2057,8 +2057,7 @@ _dbus_full_duplex_pipe (int *fd1,
if (connect (socket1, (struct sockaddr *)&saddr, len) != SOCKET_ERROR ||
WSAGetLastError () != WSAEWOULDBLOCK)
{
- dbus_set_error_const (error, DBUS_ERROR_FAILED,
- "_dbus_full_duplex_pipe socketpair() emulation failed");
+ DBUS_SOCKET_SET_ERRNO ();
goto out1;
}