xserver: Branch 'master'

[Adam Jackson]

 configure.ac               |    3 ++-
 hw/xwayland/xwayland-shm.c |    4 ++++
 include/dix-config.h.in    |    3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit a2c3c34b44b866440a152511e682c98879ee13b7
Author: Jonas Ådahl <jadahl at gmail.com>
Date:   Tue Mar 8 20:05:33 2016 +0800

    xwayland: Correctly detect whether posix_fallocate exists
    
    We had HAVE_POSIX_FALLOCATE checks, but no such macros were ever
    defined anywhere. This commit makes it so that this macro is defined if
    the posix_fallocate is detected during configure.
    
    Signed-off-by: Jonas Ådahl <jadahl at gmail.com>
    Reviewed-by: Julien Cristau <jcristau at debian.org>

diff --git a/configure.ac b/configure.ac
index c166841..2c70cda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -218,7 +218,8 @@ AC_SUBST(DLOPEN_LIBS)
 dnl Checks for library functions.
 AC_CHECK_FUNCS([backtrace ffs geteuid getuid issetugid getresuid \
 	getdtablesize getifaddrs getpeereid getpeerucred getprogname getzoneid \
-	mmap seteuid shmctl64 strncasecmp vasprintf vsnprintf walkcontext setitimer])
+	mmap posix_fallocate seteuid shmctl64 strncasecmp vasprintf vsnprintf \
+	walkcontext setitimer])
 AC_REPLACE_FUNCS([reallocarray strcasecmp strcasestr strlcat strlcpy strndup])
 
 AC_CHECK_DECLS([program_invocation_short_name], [], [], [[#include <errno.h>]])
diff --git a/hw/xwayland/xwayland-shm.c b/hw/xwayland/xwayland-shm.c
index 1beade9..e8545b3 100644
--- a/hw/xwayland/xwayland-shm.c
+++ b/hw/xwayland/xwayland-shm.c
@@ -24,6 +24,10 @@
  * SOFTWARE.
  */
 
+#ifdef HAVE_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include "xwayland.h"
 
 #include <sys/mman.h>
diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 940d2b7..a164c15 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -521,4 +521,7 @@
 /* Have setitimer support */
 #undef HAVE_SETITIMER
 
+/* Have posix_fallocate() */
+#undef HAVE_POSIX_FALLOCATE
+
 #endif /* _DIX_CONFIG_H_ */