frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove remaining #ifdef DPSEXT stanzas.

This commit is contained in:
Adam Jackson 2006-01-08 23:43:54 +00:00
parent 7fc9bc44e0
commit 53dbd00a75
5 changed files with 9 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-01-08 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/loader/dixsym.c:
* include/globals.h:
* mi/miinitext.c:
* os/utils.c:
Remove remaining #ifdef DPSEXT stanzas.
2006-01-06 Adam Jackson <ajax@freedesktop.org> 2006-01-06 Adam Jackson <ajax@freedesktop.org>
* hw/xfree86/dri/dri.c: * hw/xfree86/dri/dri.c:

3
hw/xfree86/loader/dixsym.c
View File

@ -359,9 +359,6 @@ LOOKUP dixLookupTab[] = {
#ifdef DBE #ifdef DBE
SYMVAR(noDbeExtension) SYMVAR(noDbeExtension)
#endif #endif
#ifdef DPSEXT
SYMVAR(noDPSExtension)
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
SYMVAR(noDPMSExtension) SYMVAR(noDPMSExtension)
#endif #endif

4
include/globals.h
View File

@ -64,10 +64,6 @@ extern Bool noDamageExtension;
extern Bool noDbeExtension; extern Bool noDbeExtension;
#endif #endif
#ifdef DPSEXT
extern Bool noDPSExtension;
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
extern Bool noDPMSExtension; extern Bool noDPMSExtension;
#endif #endif

17
mi/miinitext.c
View File

@ -1,4 +1,4 @@
/* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.28 2005/12/29 00:19:33 anholt Exp $ */ /* $XdotOrg: xserver/xorg/mi/miinitext.c,v 1.29 2006/01/06 23:06:15 ajax Exp $ */
/* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/mi/miinitext.c,v 3.67 2003/01/12 02:44:27 dawes Exp $ */
/*********************************************************** /***********************************************************
@ -106,7 +106,6 @@ SOFTWARE.
#undef XFreeXDGA #undef XFreeXDGA
#undef XF86DRI #undef XF86DRI
#undef DPMSExtension #undef DPMSExtension
#undef DPSEXT
#undef FONTCACHE #undef FONTCACHE
#undef DAMAGE #undef DAMAGE
#undef XFIXES #undef XFIXES
@ -132,9 +131,6 @@ extern Bool noDamageExtension;
#ifdef DBE #ifdef DBE
extern Bool noDbeExtension; extern Bool noDbeExtension;
#endif #endif
#ifdef DPSEXT
extern Bool noDPSExtension;
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
extern Bool noDPMSExtension; extern Bool noDPMSExtension;
#endif #endif
@ -371,9 +367,6 @@ extern void XcupExtensionInit(INITARGS);
#ifdef DPMSExtension #ifdef DPMSExtension
extern void DPMSExtensionInit(INITARGS); extern void DPMSExtensionInit(INITARGS);
#endif #endif
#ifdef DPSEXT
extern void DPSExtensionInit(INITARGS);
#endif
#ifdef FONTCACHE #ifdef FONTCACHE
extern void FontCacheExtensionInit(INITARGS); extern void FontCacheExtensionInit(INITARGS);
#endif #endif
@ -425,9 +418,6 @@ static ExtensionToggle ExtensionToggleList[] =
#ifdef DBE #ifdef DBE
{ "DOUBLE-BUFFER", &noDbeExtension }, { "DOUBLE-BUFFER", &noDbeExtension },
#endif #endif
#ifdef DPSEXT
{ "DPSExtension", &noDPSExtension },
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
{ "DPMS", &noDPMSExtension }, { "DPMS", &noDPMSExtension },
#endif #endif
@ -659,11 +649,6 @@ InitExtensions(argc, argv)
if (!noGlxExtension) DarwinGlxExtensionInit(); if (!noGlxExtension) DarwinGlxExtensionInit();
#endif #endif
#endif #endif
#ifdef DPSEXT
#ifndef XPRINT
if (!noDPSExtension) DPSExtensionInit();
#endif
#endif
#ifdef XFIXES #ifdef XFIXES
/* must be before Render to layer DisplayCursor correctly */ /* must be before Render to layer DisplayCursor correctly */
if (!noXFixesExtension) XFixesExtensionInit(); if (!noXFixesExtension) XFixesExtensionInit();

3
os/utils.c
View File

@ -146,9 +146,6 @@ Bool noDamageExtension = FALSE;
#ifdef DBE #ifdef DBE
Bool noDbeExtension = FALSE; Bool noDbeExtension = FALSE;
#endif #endif
#ifdef DPSEXT
Bool noDPSExtension = FALSE;
#endif
#ifdef DPMSExtension #ifdef DPMSExtension
Bool noDPMSExtension = FALSE; Bool noDPMSExtension = FALSE;
#endif #endif