summaryrefslogtreecommitdiff
path: root/miext/damage/damage.c
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2010-04-19 09:26:10 -0700
committerKeith Packard <keithp@keithp.com>2010-04-19 09:26:10 -0700
commit28b7b2b8d02d975480080865f0dddebcaa2f7968 (patch)
tree275bb660082403874d882e8cbc34841efb0a0435 /miext/damage/damage.c
parentb3ab978df861c08298f57529e3db980489055c35 (diff)
unifdef -B -DRENDER to always include RENDER code
This patch was created with: git ls-files '*.[ch]' | while read f; do unifdef -B -DRENDER -o $f $f; done Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'miext/damage/damage.c')
-rw-r--r--miext/damage/damage.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index 2851aed8d..de1857355 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -596,8 +596,6 @@ damageDestroyClip(GCPtr pGC)
REGION_NOTEMPTY(d->pScreen, \
g->pCompositeClip)))
-#ifdef RENDER
-
#define TRIM_PICTURE_BOX(box, pDst) { \
BoxPtr extents = &pDst->pCompositeClip->extents;\
if(box.x1 < extents->x1) box.x1 = extents->x1; \
@@ -774,7 +772,6 @@ damageAddTraps (PicturePtr pPicture,
damageRegionProcessPending (pPicture->pDrawable);
wrap (pScrPriv, ps, AddTraps, damageAddTraps);
}
-#endif
/**********************************************************/
@@ -1882,9 +1879,7 @@ Bool
DamageSetup (ScreenPtr pScreen)
{
DamageScrPrivPtr pScrPriv;
-#ifdef RENDER
PictureScreenPtr ps = GetPictureScreenIfSet(pScreen);
-#endif
const DamageScreenFuncsRec miFuncs = {
miDamageCreate, miDamageRegister, miDamageUnregister, miDamageDestroy
};
@@ -1908,13 +1903,11 @@ DamageSetup (ScreenPtr pScreen)
wrap (pScrPriv, pScreen, SetWindowPixmap, damageSetWindowPixmap);
wrap (pScrPriv, pScreen, CopyWindow, damageCopyWindow);
wrap (pScrPriv, pScreen, CloseScreen, damageCloseScreen);
-#ifdef RENDER
if (ps) {
wrap (pScrPriv, ps, Glyphs, damageGlyphs);
wrap (pScrPriv, ps, Composite, damageComposite);
wrap (pScrPriv, ps, AddTraps, damageAddTraps);
}
-#endif
pScrPriv->funcs = miFuncs;