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.
This commit is contained in:
committed by
Daniel Stone
parent
881953813c
commit
84683f19b4
@@ -1,6 +1,6 @@
|
||||
noinst_LTLIBRARIES = libcw.la
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
|
||||
AM_CFLAGS = $(DIX_CFLAGS)
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
noinst_LTLIBRARIES = libshadow.la
|
||||
|
||||
AM_CFLAGS = $(DIX_CFLAGS) @SERVER_DEFINES@ @MODULE_DEFINES@ @LOADER_DEFINES@
|
||||
AM_CFLAGS = $(DIX_CFLAGS)
|
||||
|
||||
INCLUDES = -I$(top_srcdir)/hw/xfree86/os-support
|
||||
|
||||
|
||||
Reference in New Issue
Block a user