diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-25 19:28:36 +0000 |
| commit | 77748634e71f2c42d03d708515e65351f0b755cb (patch) | |
| tree | ed54fd6ab9f926e583c99960d3bf949297b3b4d7 /src/dummy.h | |
| parent | 106069b23188837f06b1057e03db24cad2018ea3 (diff) | |
XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_903_specialxf86-4_3_99_902xf86-4_3_99_901xf86-4_3_99_16xf86-012804-2330
Diffstat (limited to 'src/dummy.h')
| -rw-r--r-- | src/dummy.h | 10 |
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; |