summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDagobert Michelsen <dam@opencsw.org>2013-04-03 10:38:51 +0200
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-04-03 12:17:44 +0100
commit6485fafbca1dbdb0907713d2b325b63926f83fe2 (patch)
tree59c8a4652f8d53ec518515bdd6203f91e01e2a2f
parent74b4c3ac947f68a58fc0d8723850789bbb2614cf (diff)
downloaddbus-6485fafbca1dbdb0907713d2b325b63926f83fe2.tar.gz
If alloca.h is available it is required (e.g. on Solaris 10)
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63071 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
-rw-r--r--configure.ac2
-rw-r--r--dbus/dbus-sysdeps-unix.c3
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 5490cf02..dc083bb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -686,6 +686,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 b4ecc96e..fc677990 100644
--- a/dbus/dbus-sysdeps-unix.c
+++ b/dbus/dbus-sysdeps-unix.c
@@ -71,6 +71,9 @@
#ifdef HAVE_GETPEERUCRED
#include <ucred.h>
#endif
+#ifdef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
#ifdef HAVE_ADT
#include <bsm/adt.h>