Commit 2460ddfd authored by Simon McVittie's avatar Simon McVittie
Browse files

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	configure.ac
parents f67f4597 6edbb08b
...@@ -9,9 +9,14 @@ D-Bus 1.5.11 (UNRELEASED) ...@@ -9,9 +9,14 @@ D-Bus 1.5.11 (UNRELEASED)
• Turn DBusBasicValue into public API so bindings don't need to invent their • Turn DBusBasicValue into public API so bindings don't need to invent their
own "union of everything" type (fd.o #11191, Simon McVittie) own "union of everything" type (fd.o #11191, Simon McVittie)
• Enumerate data files included in the build rather than using find(1)
(fd.o #33840, Simon McVittie)
• Windows-specific: • Windows-specific:
· make dbus-daemon.exe --print-address (and --print-pid) work again · make dbus-daemon.exe --print-address (and --print-pid) work again
on Win32, but not on WinCE (fd.o #46049, Simon McVittie) on Win32, but not on WinCE (fd.o #46049, Simon McVittie)
· fix duplicate case value when compiling against mingw-w64
(fd.o #47321, Andoni Morales Alastruey)
D-Bus 1.5.10 (2012-02-21) D-Bus 1.5.10 (2012-02-21)
== ==
......
...@@ -614,16 +614,14 @@ _dbus_error_from_errno (int error_number) ...@@ -614,16 +614,14 @@ _dbus_error_from_errno (int error_number)
#ifdef EPROTONOSUPPORT #ifdef EPROTONOSUPPORT
case EPROTONOSUPPORT: case EPROTONOSUPPORT:
return DBUS_ERROR_NOT_SUPPORTED; return DBUS_ERROR_NOT_SUPPORTED;
#endif #elif defined(WSAEPROTONOSUPPORT)
#ifdef WSAEPROTONOSUPPORT
case WSAEPROTONOSUPPORT: case WSAEPROTONOSUPPORT:
return DBUS_ERROR_NOT_SUPPORTED; return DBUS_ERROR_NOT_SUPPORTED;
#endif #endif
#ifdef EAFNOSUPPORT #ifdef EAFNOSUPPORT
case EAFNOSUPPORT: case EAFNOSUPPORT:
return DBUS_ERROR_NOT_SUPPORTED; return DBUS_ERROR_NOT_SUPPORTED;
#endif #elif defined(WSAEAFNOSUPPORT)
#ifdef WSAEAFNOSUPPORT
case WSAEAFNOSUPPORT: case WSAEAFNOSUPPORT:
return DBUS_ERROR_NOT_SUPPORTED; return DBUS_ERROR_NOT_SUPPORTED;
#endif #endif
...@@ -654,32 +652,28 @@ _dbus_error_from_errno (int error_number) ...@@ -654,32 +652,28 @@ _dbus_error_from_errno (int error_number)
#ifdef ECONNREFUSED #ifdef ECONNREFUSED
case ECONNREFUSED: case ECONNREFUSED:
return DBUS_ERROR_NO_SERVER; return DBUS_ERROR_NO_SERVER;
#endif #elif defined(WSAECONNREFUSED)
#ifdef WSAECONNREFUSED
case WSAECONNREFUSED: case WSAECONNREFUSED:
return DBUS_ERROR_NO_SERVER; return DBUS_ERROR_NO_SERVER;
#endif #endif
#ifdef ETIMEDOUT #ifdef ETIMEDOUT
case ETIMEDOUT: case ETIMEDOUT:
return DBUS_ERROR_TIMEOUT; return DBUS_ERROR_TIMEOUT;
#endif #elif defined(WSAETIMEDOUT)
#ifdef WSAETIMEDOUT
case WSAETIMEDOUT: case WSAETIMEDOUT:
return DBUS_ERROR_TIMEOUT; return DBUS_ERROR_TIMEOUT;
#endif #endif
#ifdef ENETUNREACH #ifdef ENETUNREACH
case ENETUNREACH: case ENETUNREACH:
return DBUS_ERROR_NO_NETWORK; return DBUS_ERROR_NO_NETWORK;
#endif #elif defined(WSAENETUNREACH)
#ifdef WSAENETUNREACH
case WSAENETUNREACH: case WSAENETUNREACH:
return DBUS_ERROR_NO_NETWORK; return DBUS_ERROR_NO_NETWORK;
#endif #endif
#ifdef EADDRINUSE #ifdef EADDRINUSE
case EADDRINUSE: case EADDRINUSE:
return DBUS_ERROR_ADDRESS_IN_USE; return DBUS_ERROR_ADDRESS_IN_USE;
#endif #elif defined(WSAEADDRINUSE)
#ifdef WSAEADDRINUSE
case WSAEADDRINUSE: case WSAEADDRINUSE:
return DBUS_ERROR_ADDRESS_IN_USE; return DBUS_ERROR_ADDRESS_IN_USE;
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment