[PATCH] Fix XQuartz build

[Jon TURNEY]

On 31/03/2015 01:06, Jeremy Huddleston Sequoia wrote:
> One additional change needed (see below).  Please squash that in and then you can tag it:
>
> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
> Tested-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>

Hi Keith,

Please apply this patch to master.

Thanks


-------------- next part --------------
From 146cec4a783d49d9eb62ba001355121627ba1373 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney at dronecode.org.uk>
Date: Sun, 29 Mar 2015 23:18:49 +0100
Subject: [PATCH] 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>
---
 hw/xquartz/xpr/xprScreen.c | 2 ++
 mi/miinitext.c             | 3 +++
 2 files changed, 5 insertions(+)

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"
 
-- 
2.1.4