summaryrefslogtreecommitdiff
path: root/src/dummy.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/dummy.h')
-rw-r--r--src/dummy.h10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/dummy.h b/src/dummy.h
index 3f9243d..edffc4e 100644
--- a/src/dummy.h
+++ b/src/dummy.h
@@ -1,3 +1,4 @@
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */
/* All drivers should typically include these */
#include "xf86.h"
@@ -6,11 +7,8 @@
#include "xf86Cursor.h"
-#ifdef XvExtension
-# include "xf86xv.h"
-# include "Xv.h"
-#endif /* XvExtension */
-
+#include "xf86xv.h"
+#include "Xv.h"
/* Supported chipsets */
typedef enum {
@@ -59,14 +57,12 @@ typedef struct dummyRec
int cursorFG, cursorBG;
Bool screenSaver;
-#ifdef XvExtension
Bool video;
XF86VideoAdaptorPtr overlayAdaptor;
int overlay;
int overlay_offset;
int videoKey;
int interlace;
-#endif /* XvExtension */
dummy_colors colors[256];
pointer* FBBase;
} DUMMYRec, *DUMMYPtr;