From: Ralf Habacker <ralf.habacker@freenet.de>
Date: Thu, 24 May 2007 17:28:42 +0000 (+0000)
Subject: * dbus/dbus-sysdeps-win.c (_dbus_full_duplex_pipe): fixed assertation.
X-Git-Tag: dbus-1.1.0~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1e6025ef4ffc8ecde6b35104549132d890aa260a;p=thirdparty%2Fdbus.git

* dbus/dbus-sysdeps-win.c (_dbus_full_duplex_pipe): fixed assertation.
---

diff --git a/ChangeLog b/ChangeLog
index 77a29e93d..82638f3da 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 f8c4dfd4f..095fdd6f3 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;
     }