summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>2012-03-28 00:06:32 -0500
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>2012-04-05 21:52:38 -0500
commit668223a665af38600b8b20152c7e53e731c76234 (patch)
treed6aed0aec276c00c345e9d82b836d00bd064989d
parent02918fd53434a23a72fe878a90f4ec48ef0e0416 (diff)
Only include Xv headers if server supports it
Signed-off-by: Yaakov Selkowitz <yselkowitz@users.sourceforge.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com>
-rw-r--r--src/dummy.h4
-rw-r--r--src/dummy_driver.c2
2 files changed, 6 insertions, 0 deletions
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.