xserver: Branch 'master' - 2 commits

[Keith Packard]

 hw/xfree86/drivers/modesetting/dumb_bo.c |    4 ++++
 include/dix-config.h.in                  |    6 ++++++
 2 files changed, 10 insertions(+)

New commits:
commit 145ae03814cb3b700b6fe1fd19f8fb15da84d1c8
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Mar 17 10:21:13 2015 +0900

    modesetting: Include dix-config.h from dumb_bo.c
    
    Fixes mmap failures with 32-bit builds.
    
    Signed-off-by: Michel Dänzer <michel at daenzer.net>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/drivers/modesetting/dumb_bo.c b/hw/xfree86/drivers/modesetting/dumb_bo.c
index 58d420e..cf13f0a 100644
--- a/hw/xfree86/drivers/modesetting/dumb_bo.c
+++ b/hw/xfree86/drivers/modesetting/dumb_bo.c
@@ -25,6 +25,10 @@
  *
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include "dix-config.h"
+#endif
+
 #include "dumb_bo.h"
 
 #include <errno.h>
commit 4962c8c08842d9d3ca66d254b1ce4cacc4fb3756
Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Tue Mar 17 10:21:12 2015 +0900

    Add AC_SYS_LARGEFILE defines to dix-config.h
    
    Without this, AC_SYS_LARGEFILE doesn't actually have any effect.
    
    Signed-off-by: Michel Dänzer <michel at daenzer.net>
    Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/include/dix-config.h.in b/include/dix-config.h.in
index 78c2010..76f45f5 100644
--- a/include/dix-config.h.in
+++ b/include/dix-config.h.in
@@ -391,9 +391,15 @@
 /* Vendor name */
 #undef XVENDORNAME
 
+/* Number of bits in a file offset, on hosts where this is settable. */
+#undef _FILE_OFFSET_BITS
+
 /* Enable GNU and other extensions to the C environment for GLIBC */
 #undef _GNU_SOURCE
 
+/* Define for large files, on AIX-style hosts. */
+#undef _LARGE_FILES
+
 /* Define to empty if `const' does not conform to ANSI C. */
 #undef const