From 0ba1794fe2896395875f62e911720c7585687444 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@apple.com>
Date: Thu, 19 Apr 2012 16:51:46 -0700
Subject: [PATCH] xres: Fix build without composite
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Regression from: b8d0d19a6d410776b53a41e7cae90f68d4b22bb7
Signed-off-by: Jeremy Huddleston <jeremyhu@apple.com>
Reviewed-by: Rami Ylimäki <rami.ylimaki@vincit.fi>
Tested-By: Michal Suchanek <hramrach@gmail.com>
---
 Xext/xres.c           | 3 +++
 hw/xfree86/sdksyms.sh | 3 ++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/Xext/xres.c b/Xext/xres.c
index ecef0c032..dbefeebdb 100644
--- a/Xext/xres.c
+++ b/Xext/xres.c
@@ -29,7 +29,10 @@
 #include <string.h>
 #include "hashtable.h"
 #include "picturestr.h"
+
+#ifdef COMPOSITE
 #include "compint.h"
+#endif
 
 /** @brief Holds fragments of responses for ConstructClientIds.
  *
diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 3815525fa..f6c3f2244 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -251,8 +251,9 @@ cat > sdksyms.c << EOF
 #include "exa.h"
  */
 
-
+#ifdef COMPOSITE
 #include "compositeext.h"
+#endif
 
 /* xfixes/Makefile.am */
 #include "xfixes.h"