diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-03 12:22:24 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-04-03 12:22:24 +0100 |
| commit | 89c1ecdd7cdd6c836506065a47bfb47d20bbb874 (patch) | |
| tree | 54ea03fcf0baba3d3f82abc8c622dc93b45b7713 | |
| parent | ee49d0672a04c68850c7d48988d0373caa3077ab (diff) | |
| parent | aa8dcc13a6f0e8711940fae247d1b8064104f893 (diff) | |
Merge branch 'dbus-1.6'
| -rw-r--r-- | NEWS | 14 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | dbus/dbus-sysdeps-unix.c | 3 |
3 files changed, 19 insertions, 0 deletions
@@ -1,6 +1,20 @@ D-Bus 1.7.2 (UNRELEASED) == +• Unix-specific: + · Under systemd, log to syslog only, not stderr, avoiding duplication + (fd.o #61399, #39987; Colin Walters, Dagobert Michelsen) + · Include alloca.h for alloca() if available, fixing compilation on + Solaris 10 (fd.o #63071, Dagobert Michelsen) + · Allow use of systemd-logind without the rest of systemd + (fd.o #62585, Martin Pitt) + · When built with CMake, link to librt and use the right path for + meinproc's XSLT stylesheets (fd.o #61637, Ralf Habacker) + +• Windows-specific: + · Do not claim that all bus clients have the dbus-daemon's credentials + (fd.o #61787, Ralf Habacker) + D-Bus 1.7.0 (2013-02-22) == diff --git a/configure.ac b/configure.ac index ee89dcb42..3bd2405ee 100644 --- a/configure.ac +++ b/configure.ac @@ -688,6 +688,8 @@ AC_CHECK_HEADERS(ws2tcpip.h) AC_CHECK_HEADERS(wspiapi.h) +AC_CHECK_HEADERS(alloca.h) + # Add -D_POSIX_PTHREAD_SEMANTICS if on Solaris # case $host_os in diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c index 30606ff97..88db41537 100644 --- a/dbus/dbus-sysdeps-unix.c +++ b/dbus/dbus-sysdeps-unix.c @@ -72,6 +72,9 @@ #ifdef HAVE_GETPEERUCRED #include <ucred.h> #endif +#ifdef HAVE_ALLOCA_H +#include <alloca.h> +#endif #ifdef HAVE_ADT #include <bsm/adt.h> |