From 668223a665af38600b8b20152c7e53e731c76234 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Date: Wed, 28 Mar 2012 00:06:32 -0500
Subject: [PATCH] Only include Xv headers if server supports it

Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net>
Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
---
 src/dummy.h        | 4 ++++
 src/dummy_driver.c | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/dummy.h b/src/dummy.h
index 3442f63..966ab02 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -5,8 +5,10 @@
 
 #include "xf86Cursor.h"
 
+#ifdef XvExtension
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
+#endif
 #include <string.h>
 
 /* Supported chipsets */
@@ -57,7 +59,9 @@ typedef struct dummyRec
 
     Bool screenSaver;
     Bool video;
+#ifdef XvExtension
     XF86VideoAdaptorPtr overlayAdaptor;
+#endif
     int overlay;
     int overlay_offset;
     int videoKey;
diff --git a/src/dummy_driver.c b/src/dummy_driver.c
index 6533b27..791855f 100644
--- a/src/dummy_driver.c
+++ b/src/dummy_driver.c
@@ -32,8 +32,10 @@
 
 #include "picturestr.h"
 
+#ifdef XvExtension
 #include "xf86xv.h"
 #include <X11/extensions/Xv.h>
+#endif
 
 /*
  * Driver data structures.