From 67eaf4b46f678bc904f47dfcab6655e170d843e0 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 9 Feb 2013 20:34:33 -0800
Subject: [PATCH 1/3] XQuartz: Ensure <dix-config.h> is included in
 capabilities.c

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 hw/xquartz/GL/capabilities.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/xquartz/GL/capabilities.c b/hw/xquartz/GL/capabilities.c
index 4702595f4..5573629fd 100644
--- a/hw/xquartz/GL/capabilities.c
+++ b/hw/xquartz/GL/capabilities.c
@@ -20,6 +20,10 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <assert.h>

From 5da82f872daf25939a8fa04f1561b01f0315a623 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 9 Feb 2013 20:40:10 -0800
Subject: [PATCH 2/3] os: Ensure <dix-config.h> is included in strndup.c

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
---
 os/strndup.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/os/strndup.c b/os/strndup.c
index b604b9bac..e0eddf13d 100644
--- a/os/strndup.c
+++ b/os/strndup.c
@@ -27,6 +27,10 @@
  * SUCH DAMAGE.
  */
 
+#ifdef HAVE_DIX_CONFIG_H
+#include <dix-config.h>
+#endif
+
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>

From eda7dbff5a9f35fefe1e3dedacb82daadbf5945e Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
Date: Sat, 9 Feb 2013 20:53:02 -0800
Subject: [PATCH 3/3] XORG_TLS: Pick the first option that works (ie: prefer
 __thread)

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
---
 m4/xorg-tls.m4 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/m4/xorg-tls.m4 b/m4/xorg-tls.m4
index 237fdcd9e..e04f1ff56 100644
--- a/m4/xorg-tls.m4
+++ b/m4/xorg-tls.m4
@@ -28,7 +28,7 @@ AC_DEFUN([XORG_TLS], [
         ac_cv_tls=none
         keywords="__thread __declspec(thread)"
         for kw in $keywords ; do
-            AC_TRY_COMPILE([int $kw test;], [], ac_cv_tls=$kw)
+            AC_TRY_COMPILE([int $kw test;], [], ac_cv_tls=$kw ; break ;)
         done
     ])
     AC_MSG_RESULT($ac_cv_tls)