diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c index 81de33769..d420c41db 100644 --- a/hw/xquartz/xpr/xprScreen.c +++ b/hw/xquartz/xpr/xprScreen.c @@ -48,11 +48,7 @@ #include "micmap.h" #include "rootlessCommon.h" - -#ifdef DAMAGE #include "damage.h" -#endif - #include "nonsdk_extinit.h" #include "extinit_priv.h" @@ -439,12 +435,10 @@ have_depth: static Bool xprSetupScreen(int index, ScreenPtr pScreen) { -#ifdef DAMAGE // The Damage extension needs to wrap underneath the // generic rootless layer, so do it now. if (!DamageSetup(pScreen)) return FALSE; -#endif // Initialize generic rootless code if (!xprInit(pScreen)) diff --git a/include/extinit.h b/include/extinit.h index 6a16f4d77..a9f279126 100644 --- a/include/extinit.h +++ b/include/extinit.h @@ -54,10 +54,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "extnsionst.h" extern _X_EXPORT Bool noCompositeExtension; - -#ifdef DAMAGE extern _X_EXPORT Bool noDamageExtension; -#endif #if defined(DBE) extern _X_EXPORT Bool noDbeExtension; diff --git a/include/meson.build b/include/meson.build index 19eb16967..142df38c2 100644 --- a/include/meson.build +++ b/include/meson.build @@ -199,7 +199,6 @@ endif conf_data.set('UNIXCONN', host_machine.system() != 'windows' ? '1' : false) conf_data.set('IPv6', build_ipv6 ? '1' : false) -conf_data.set('DAMAGE', '1') conf_data.set('DBE', '1') conf_data.set('DGA', build_dga ? '1' : false) conf_data.set('DPMSExtension', build_dpms ? '1' : false) diff --git a/mi/miinitext.c b/mi/miinitext.c index 68030332e..bd4ec1e9c 100644 --- a/mi/miinitext.c +++ b/mi/miinitext.c @@ -126,9 +126,7 @@ static const ExtensionModule staticExtensions[] = { {RRExtensionInit, "RANDR", &noRRExtension}, #endif {CompositeExtensionInit, "COMPOSITE", &noCompositeExtension}, -#ifdef DAMAGE {DamageExtensionInit, "DAMAGE", &noDamageExtension}, -#endif #ifdef SCREENSAVER {ScreenSaverExtensionInit, "MIT-SCREEN-SAVER", &noScreenSaverExtension}, #endif diff --git a/os/utils.c b/os/utils.c index ac90adac7..a91aadd6e 100644 --- a/os/utils.c +++ b/os/utils.c @@ -119,12 +119,9 @@ __stdcall unsigned long GetTickCount(void); #include "dixstruct_priv.h" Bool noTestExtensions; - Bool noCompositeExtension = FALSE; - -#ifdef DAMAGE Bool noDamageExtension = FALSE; -#endif + #ifdef DBE Bool noDbeExtension = FALSE; #endif