DRI XFree86-4_3_99_12-merge import

Merging XORG-CURRENT into trunk
Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
2026-03-24 09:34:57 +00:00 · 2004-06-16 09:23:04 +00:00 · 2004-04-23 19:31:36 +00:00 · 2004-03-14 08:33:20 +00:00 · 2004-03-03 12:12:18 +00:00 · 2004-02-26 13:35:52 +00:00
1 changed files with 1 additions and 5 deletions
--- a/src/fbdev.c
+++ b/src/fbdev.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.42 2002/10/10 01:35:20 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.43 2003/04/23 21:51:35 tsi Exp $ */

 /*
 * Authors:  Alan Hourihane, <alanh@fairlite.demon.co.uk>
@@ -29,9 +29,7 @@

 #include "fbdevhw.h"

-#ifdef XvExtension
 #include "xf86xv.h"
-#endif

 #define DEBUG 0

@@ -850,7 +848,6 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	fPtr->CloseScreen = pScreen->CloseScreen;
 	pScreen->CloseScreen = FBDevCloseScreen;

-#ifdef XvExtension
 	{
 	    XF86VideoAdaptorPtr *ptr;

@@ -859,7 +856,6 @@ FBDevScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 		xf86XVScreenInit(pScreen,ptr,n);
 	    }
 	}
-#endif

 	TRACE_EXIT("FBDevScreenInit");
Author	SHA1	Message	Date
Eric Anholt	db6514cea0	DRI XFree86-4_3_99_12-merge import	2004-06-16 09:23:04 +00:00
Egbert Eich	1e80fe1bf9	Merging XORG-CURRENT into trunk	2004-04-23 19:31:36 +00:00
Egbert Eich	5d8a0a2e47	Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004	2004-03-14 08:33:20 +00:00
Egbert Eich	69d61895f3	Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004	2004-03-03 12:12:18 +00:00
Egbert Eich	806863c5f6	readding XFree86's cvs IDs	2004-02-26 13:35:52 +00:00
Egbert Eich	595a614cd9	Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004	2004-02-26 09:23:18 +00:00
Egbert Eich	62bec818a1	Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004	2004-01-29 08:08:35 +00:00
Kaleb Keithley	48e31aaed2	XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks	2003-11-25 19:28:36 +00:00
Kaleb Keithley	3a00d91359	XFree86 4.3.0.1	2003-11-14 16:48:55 +00:00