[PULL] Misc patches

[Jon TURNEY]

On 29/03/2015 21:31, Colin Harrison wrote:
> Builds for me on MinGW-w64. I suspect the '#ifdef INXQUARTZ' ...'#endif', 5
> lines, removal in exinit.h needs reverting for Jeremy?
> Sorry, I can't test for the Darwin build.

That would work, but I think better would be to #include 
"nonsdk_extinit.h" in miiniext.c, to avoid duplicating the prototype of 
PseudoramiXExtensionInit()

>> Sorry, I didn't get around to reviewing or testing these earlier.  I
> suspect this
>> might be the cause of the build failure fallout on tinderbox:
>>
>> http://tinderbox.x.org/builds/2015-03-29-0002/logs/xserver/#build

Jeremy,

Sorry for the breakage.  I should know by now better than to touch this 
stuff.

Can you try the attached please?

-------------- next part --------------
From 99d0a904140539fa5df1075cdfc9f5cde22d48a5 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" under INXQUARTZ to provide declarations used
under INXQUARTZ

Signed-off-by: Jon Turney <jon.turney at dronecode.org.uk>
---
 mi/miinitext.c | 3 +++
 1 file changed, 3 insertions(+)

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