From 84683f19b4d1c712281036bcabf8dc623e64b26a Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Tue, 18 Jul 2006 18:16:12 -0400 Subject: get rid of XFree86LOADER, XFree86Server, XFree86Module, and IN_MODULE Get rid of almost all uses of these definitions. They're still defined for delinquent out-of-tree drivers, and also for the Mesa build. As well as for miinitext.c. But largely gone. --- miext/damage/Makefile.am | 2 +- miext/damage/damage.c | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) (limited to 'miext/damage') diff --git a/miext/damage/Makefile.am b/miext/damage/Makefile.am index 2af9ac2e2..595835731 100644 --- a/miext/damage/Makefile.am +++ b/miext/damage/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libdamage.la -AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@ +AM_CFLAGS = $(DIX_CFLAGS) INCLUDES = -I$(srcdir)/../cw -I$(top_srcdir)/hw/xfree86/os-support diff --git a/miext/damage/damage.c b/miext/damage/damage.c index ef7bca455..2e80011ac 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1770,7 +1770,6 @@ DamageSetup (ScreenPtr pScreen) if (!pScrPriv) return FALSE; -#ifdef XFree86Server #ifdef COMPOSITE /* This is a kludge to ensure wrapping order with the composite wrapper. * If it's done from compinit.c, then DamageSetup may be called before the @@ -1779,7 +1778,6 @@ DamageSetup (ScreenPtr pScreen) */ if (!noCompositeExtension) miInitializeCompositeWrapper (pScreen); -#endif #endif pScrPriv->internalLevel = 0; -- cgit v1.2.3