diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-03 10:20:01 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-09-03 10:20:01 +0100 |
| commit | 4d0a69027e6d089bab15ff7e844a0ab08256620c (patch) | |
| tree | f81b86667b58b7210a11df1a9ebcd4bea46ffdce | |
| parent | 8d012ff68d245c4812b3e8929fcec949e8881ae1 (diff) | |
| parent | 6dcef0c8f0d3ef541d215b892f08645d3f187e24 (diff) | |
| download | dbus-4d0a69027e6d089bab15ff7e844a0ab08256620c.tar.gz | |
Merge branch 'dbus-1.6'
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 4 |
2 files changed, 5 insertions, 1 deletions
@@ -25,6 +25,8 @@ Fixes: • Unix-specific: · Fix compilation on Solaris (fd.o #53286, Jonathan Perkin) + · Work around interdependent headers on OpenBSD by including sys/types.h + before each use of sys/socket.h (fd.o #54418, Brad Smith) • Windows-specific: · The default session bus listening and connecting address is now diff --git a/configure.ac b/configure.ac index fee9db6b..e2c9bdf7 100644 --- a/configure.ac +++ b/configure.ac @@ -765,7 +765,8 @@ dnl needed on darwin for NAME_MAX AC_CHECK_HEADERS(sys/syslimits.h) dnl Make it easy to check if we have MSG_NOSIGNAL without actually having to include sys/socket.h -AC_CHECK_DECLS([MSG_NOSIGNAL], [], [], [[ #include <sys/socket.h> ]]) +AC_CHECK_DECLS([MSG_NOSIGNAL], [], [], [[ #include <sys/types.h> +#include <sys/socket.h> ]]) dnl check for flavours of varargs macros (test from GLib) AC_MSG_CHECKING(for ISO C99 varargs macros in C) @@ -1219,6 +1220,7 @@ AC_SUBST([ADT_LIBS]) # Check for SCM_RIGHTS AC_MSG_CHECKING([for SCM_RIGHTS]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ +#include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> static int x = SCM_RIGHTS; |