xserver: Branch 'master'

[Keith Packard]

 hw/xquartz/xpr/xprScreen.c |    2 ++
 mi/miinitext.c             |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit d3b9c47c849d039493c5e0ca5c3af8affe738746
Author: Jon Turney <jon.turney at dronecode.org.uk>
Date:   Sun Mar 29 23:18:49 2015 +0100

    Fix XQuartz build
    
    Fix XQuartz build since commit e036cbfc "Make PseudoramiXExtensionInit()
    prototype more generally available"
    
    Add #include "nonsdk_extinit.h" to xprScreen.c
    
    Add #include "nonsdk_extinit.h" to miinitext.c under INXQUARTZ to provide
    declarations used under INXQUARTZ
    
    Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
    Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Tested-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
index d0a525f..30f2218 100644
--- a/hw/xquartz/xpr/xprScreen.c
+++ b/hw/xquartz/xpr/xprScreen.c
@@ -54,6 +54,8 @@
 #include "damage.h"
 #endif
 
+#include "nonsdk_extinit.h"
+
 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
 // From NSApplication.h
 extern const double NSAppKitVersionNumber;
diff --git a/mi/miinitext.c b/mi/miinitext.c
index 5872bf5..086d2c3 100644
--- a/mi/miinitext.c
+++ b/mi/miinitext.c
@@ -108,6 +108,9 @@ SOFTWARE.
 #include "misc.h"
 #include "extension.h"
 #include "extinit.h"
+#ifdef INXQUARTZ
+#include "nonsdk_extinit.h"
+#endif
 #include "micmap.h"
 #include "globals.h"