diff options
author | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-22 13:02:12 +0000 |
commit | 2446c474aae15bcaf31e4b799f94f21d515984d5 (patch) | |
tree | 31c649543787afa72f5908dedf07ec8ae37a84a2 /xorg-server/miext/damage/damagestr.h | |
parent | 0b44ee3fb92120190fa46e73b7abfbaa8a0adaec (diff) | |
download | vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.gz vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.tar.bz2 vcxsrv-2446c474aae15bcaf31e4b799f94f21d515984d5.zip |
svn merge -r541:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/miext/damage/damagestr.h')
-rw-r--r-- | xorg-server/miext/damage/damagestr.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/miext/damage/damagestr.h b/xorg-server/miext/damage/damagestr.h index d7435b2a1..b224958d1 100644 --- a/xorg-server/miext/damage/damagestr.h +++ b/xorg-server/miext/damage/damagestr.h @@ -30,9 +30,7 @@ #include "damage.h" #include "gcstruct.h" #include "privates.h" -#ifdef RENDER # include "picturestr.h" -#endif typedef struct _damage { DamagePtr pNext; @@ -72,11 +70,9 @@ typedef struct _damageScrPriv { DestroyPixmapProcPtr DestroyPixmap; SetWindowPixmapProcPtr SetWindowPixmap; DestroyWindowProcPtr DestroyWindow; -#ifdef RENDER CompositeProcPtr Composite; GlyphsProcPtr Glyphs; AddTrapsProcPtr AddTraps; -#endif /* Table of wrappable function pointers */ DamageScreenFuncsRec funcs; |