diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2006-07-18 18:16:12 -0400 |
|---|---|---|
| committer | Daniel Stone <daniels@endtroducing.fooishbar.org> | 2006-07-18 18:17:38 -0400 |
| commit | 84683f19b4d1c712281036bcabf8dc623e64b26a (patch) | |
| tree | 94c61eca298da6f6200fcb8ba8a4d1009b1495b7 /miext | |
| parent | 881953813c7307f2aac4057b48d233e5f4a574cd (diff) | |
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.
Diffstat (limited to 'miext')
| -rw-r--r-- | miext/cw/Makefile.am | 2 | ||||
| -rw-r--r-- | miext/damage/Makefile.am | 2 | ||||
| -rwxr-xr-x | miext/damage/damage.c | 2 | ||||
| -rw-r--r-- | miext/shadow/Makefile.am | 2 |
4 files changed, 3 insertions, 5 deletions
diff --git a/miext/cw/Makefile.am b/miext/cw/Makefile.am index 9b8e2c25e..e056f4279 100644 --- a/miext/cw/Makefile.am +++ b/miext/cw/Makefile.am @@ -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 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 @@ -1780,7 +1779,6 @@ DamageSetup (ScreenPtr pScreen) if (!noCompositeExtension) miInitializeCompositeWrapper (pScreen); #endif -#endif pScrPriv->internalLevel = 0; pScrPriv->pScreenDamage = 0; diff --git a/miext/shadow/Makefile.am b/miext/shadow/Makefile.am index 1426c033e..a73d0ec78 100644 --- a/miext/shadow/Makefile.am +++ b/miext/shadow/Makefile.am @@ -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 |