diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | hw/xfree86/loader/dixsym.c | 3 | ||||
| -rw-r--r-- | include/globals.h | 4 | ||||
| -rw-r--r-- | mi/miinitext.c | 17 | ||||
| -rw-r--r-- | os/utils.c | 3 |
5 files changed, 9 insertions, 26 deletions
@@ -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> * hw/xfree86/dri/dri.c: diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c index dd76a6363..28288f846 100644 --- a/hw/xfree86/loader/dixsym.c +++ b/hw/xfree86/loader/dixsym.c @@ -359,9 +359,6 @@ LOOKUP dixLookupTab[] = { #ifdef DBE SYMVAR(noDbeExtension) #endif -#ifdef DPSEXT - SYMVAR(noDPSExtension) -#endif #ifdef DPMSExtension SYMVAR(noDPMSExtension) #endif diff --git a/include/globals.h b/include/globals.h index 924608e89..911d0c0b7 100644 --- a/include/globals.h +++ b/include/globals.h @@ -64,10 +64,6 @@ extern Bool noDamageExtension; extern Bool noDbeExtension; #endif -#ifdef DPSEXT -extern Bool noDPSExtension; -#endif - #ifdef DPMSExtension extern Bool noDPMSExtension; #endif diff --git a/mi/miinitext.c b/mi/miinitext.c index bdb51f262..55eff4306 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -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 $ */ /*********************************************************** @@ -106,7 +106,6 @@ SOFTWARE. #undef XFreeXDGA #undef XF86DRI #undef DPMSExtension -#undef DPSEXT #undef FONTCACHE #undef DAMAGE #undef XFIXES @@ -132,9 +131,6 @@ extern Bool noDamageExtension; #ifdef DBE extern Bool noDbeExtension; #endif -#ifdef DPSEXT -extern Bool noDPSExtension; -#endif #ifdef DPMSExtension extern Bool noDPMSExtension; #endif @@ -371,9 +367,6 @@ extern void XcupExtensionInit(INITARGS); #ifdef DPMSExtension extern void DPMSExtensionInit(INITARGS); #endif -#ifdef DPSEXT -extern void DPSExtensionInit(INITARGS); -#endif #ifdef FONTCACHE extern void FontCacheExtensionInit(INITARGS); #endif @@ -425,9 +418,6 @@ static ExtensionToggle ExtensionToggleList[] = #ifdef DBE { "DOUBLE-BUFFER", &noDbeExtension }, #endif -#ifdef DPSEXT - { "DPSExtension", &noDPSExtension }, -#endif #ifdef DPMSExtension { "DPMS", &noDPMSExtension }, #endif @@ -659,11 +649,6 @@ InitExtensions(argc, argv) if (!noGlxExtension) DarwinGlxExtensionInit(); #endif #endif -#ifdef DPSEXT -#ifndef XPRINT - if (!noDPSExtension) DPSExtensionInit(); -#endif -#endif #ifdef XFIXES /* must be before Render to layer DisplayCursor correctly */ if (!noXFixesExtension) XFixesExtensionInit(); diff --git a/os/utils.c b/os/utils.c index 4c794c2c9..c58b6159d 100644 --- a/os/utils.c +++ b/os/utils.c @@ -146,9 +146,6 @@ Bool noDamageExtension = FALSE; #ifdef DBE Bool noDbeExtension = FALSE; #endif -#ifdef DPSEXT -Bool noDPSExtension = FALSE; -#endif #ifdef DPMSExtension Bool noDPMSExtension = FALSE; #endif |