diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-27 14:52:24 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-03-27 14:52:24 +0100 |
| commit | 2460ddfdb2c1980226593e1af42117b38d5be7dc (patch) | |
| tree | 716e5aaa81a315eef841ad449d68eb21dd593726 | |
| parent | f67f45979b48ce63fb82179a7ec261e5e3ec3395 (diff) | |
| parent | 6edbb08b0ee52096b54c496ef33df684642a02f8 (diff) | |
| download | dbus-2460ddfdb2c1980226593e1af42117b38d5be7dc.tar.gz dbus-2460ddfdb2c1980226593e1af42117b38d5be7dc.tar.bz2 dbus-2460ddfdb2c1980226593e1af42117b38d5be7dc.zip | |
Merge branch 'dbus-1.4'
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps.c | 18 |
2 files changed, 11 insertions, 12 deletions
@@ -9,9 +9,14 @@ D-Bus 1.5.11 (UNRELEASED) • Turn DBusBasicValue into public API so bindings don't need to invent their 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: · make dbus-daemon.exe --print-address (and --print-pid) work again 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) == diff --git a/dbus/dbus-sysdeps.c b/dbus/dbus-sysdeps.c index c2258b3c..1a93cea7 100644 --- a/dbus/dbus-sysdeps.c +++ b/dbus/dbus-sysdeps.c @@ -614,16 +614,14 @@ _dbus_error_from_errno (int error_number) #ifdef EPROTONOSUPPORT case EPROTONOSUPPORT: return DBUS_ERROR_NOT_SUPPORTED; -#endif -#ifdef WSAEPROTONOSUPPORT +#elif defined(WSAEPROTONOSUPPORT) case WSAEPROTONOSUPPORT: return DBUS_ERROR_NOT_SUPPORTED; #endif #ifdef EAFNOSUPPORT case EAFNOSUPPORT: return DBUS_ERROR_NOT_SUPPORTED; -#endif -#ifdef WSAEAFNOSUPPORT +#elif defined(WSAEAFNOSUPPORT) case WSAEAFNOSUPPORT: return DBUS_ERROR_NOT_SUPPORTED; #endif @@ -654,32 +652,28 @@ _dbus_error_from_errno (int error_number) #ifdef ECONNREFUSED case ECONNREFUSED: return DBUS_ERROR_NO_SERVER; -#endif -#ifdef WSAECONNREFUSED +#elif defined(WSAECONNREFUSED) case WSAECONNREFUSED: return DBUS_ERROR_NO_SERVER; #endif #ifdef ETIMEDOUT case ETIMEDOUT: return DBUS_ERROR_TIMEOUT; -#endif -#ifdef WSAETIMEDOUT +#elif defined(WSAETIMEDOUT) case WSAETIMEDOUT: return DBUS_ERROR_TIMEOUT; #endif #ifdef ENETUNREACH case ENETUNREACH: return DBUS_ERROR_NO_NETWORK; -#endif -#ifdef WSAENETUNREACH +#elif defined(WSAENETUNREACH) case WSAENETUNREACH: return DBUS_ERROR_NO_NETWORK; #endif #ifdef EADDRINUSE case EADDRINUSE: return DBUS_ERROR_ADDRESS_IN_USE; -#endif -#ifdef WSAEADDRINUSE +#elif defined(WSAEADDRINUSE) case WSAEADDRINUSE: return DBUS_ERROR_ADDRESS_IN_USE; #endif |