From 5b02d5b7aaabf1ba8dcbdfe4525b7995b4e79f92 Mon Sep 17 00:00:00 2001 From: Alan Coopersmith Date: Thu, 7 Nov 2013 21:08:56 -0800 Subject: [PATCH] Enable XTRANS_SEND_FDS on Solaris too. Requires passing through the __EXTENSIONS__ and _XOPEN_SOURCE defines in order to expose the msg_control members in struct msghdr. Signed-off-by: Alan Coopersmith Reviewed-by: Adam Jackson --- configure.ac | 3 ++- include/dix-config.h.in | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ff3f4a983..eb90b1ae0 100644 --- a/configure.ac +++ b/configure.ac @@ -31,6 +31,7 @@ RELEASE_DATE="2013-10-31" RELEASE_NAME="Bom Retiro" AC_CONFIG_SRCDIR([Makefile.am]) AM_INIT_AUTOMAKE([foreign dist-bzip2]) +AC_USE_SYSTEM_EXTENSIONS # Require xorg-macros minimum of 1.14 for XORG_COMPILER_BRAND in XORG_DEFAULT_OPTIONS m4_ifndef([XORG_MACROS_VERSION], @@ -1096,7 +1097,7 @@ AC_ARG_ENABLE(xtrans-send-fds, AS_HELP_STRING([--disable-xtrans-send-fds], [Use case "x$XTRANS_SEND_FDS" in xauto) case "$host_os" in - linux*) + linux*|solaris*) XTRANS_SEND_FDS=yes ;; *) diff --git a/include/dix-config.h.in b/include/dix-config.h.in index 9bdbe53c1..d4fbe99fa 100644 --- a/include/dix-config.h.in +++ b/include/dix-config.h.in @@ -449,6 +449,14 @@ #include "dix-config-apple-verbatim.h" #endif +/* Enable general extensions on Solaris. */ +#ifndef __EXTENSIONS__ +# undef __EXTENSIONS__ +#endif + +/* Defined if needed to expose struct msghdr.msg_control */ +#undef _XOPEN_SOURCE + /* Have support for X shared memory fence library (xshmfence) */ #undef HAVE_XSHMFENCE