diff options
| author | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
|---|---|---|
| committer | Michel Dänzer <michel@tungstengraphics.com> | 2006-12-19 16:29:26 +0100 |
| commit | 4334860e69e7d5b156082bd05c7a86708e5bad4c (patch) | |
| tree | 380e4abcbfc8950b000ff72b0347e78fee3bc74a /miext/damage | |
| parent | 7e4717683d6c08d1e490a60b7493a94bbc57bf8d (diff) | |
| parent | fdcc22ca1704d3519156c66804528c21b04fea65 (diff) | |
Merge branch 'master' into exa-damagetrack
Conflicts:
exa/exa_accel.c
exa/exa_migration.c
Diffstat (limited to 'miext/damage')
| -rw-r--r-- | miext/damage/Makefile.am | 2 | ||||
| -rwxr-xr-x | miext/damage/damage.c | 2 |
2 files changed, 1 insertions, 3 deletions
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 5b9402898..cd66b5473 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1831,7 +1831,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 @@ -1841,7 +1840,6 @@ DamageSetup (ScreenPtr pScreen) if (!noCompositeExtension) miInitializeCompositeWrapper (pScreen); #endif -#endif pScrPriv->internalLevel = 0; pScrPriv->pScreenDamage = 0; |