diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 12:14:52 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 12:14:52 +0000 |
| commit | 4c61bf84b11e26e6f22648668c95ea760a379163 (patch) | |
| tree | 0ac762ab2815eae283dded7447ad7cb5a54b926a /xorg-server/composite/compext.c | |
| parent | e1dabd2ce8be0d70c6c15353b58de256129dfd1f (diff) | |
| download | vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.tar.gz vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.tar.bz2 vcxsrv-4c61bf84b11e26e6f22648668c95ea760a379163.zip | |
xserver git update 11/6/2010
Diffstat (limited to 'xorg-server/composite/compext.c')
| -rw-r--r-- | xorg-server/composite/compext.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/xorg-server/composite/compext.c b/xorg-server/composite/compext.c index 5e557dd0b..a87b37ca8 100644 --- a/xorg-server/composite/compext.c +++ b/xorg-server/composite/compext.c @@ -50,8 +50,8 @@ #include "protocol-versions.h"
static CARD8 CompositeReqCode;
-static int CompositeClientPrivateKeyIndex;
-static DevPrivateKey CompositeClientPrivateKey = &CompositeClientPrivateKeyIndex;
+static DevPrivateKeyRec CompositeClientPrivateKeyRec;
+#define CompositeClientPrivateKey (&CompositeClientPrivateKeyRec)
RESTYPE CompositeClientWindowType;
RESTYPE CompositeClientSubwindowsType;
RESTYPE CompositeClientOverlayType;
@@ -218,7 +218,7 @@ ProcCompositeCreateRegionFromBorderClip (ClientPtr client) pRegion = XFixesRegionCopy (pBorderClip);
if (!pRegion)
return BadAlloc;
- REGION_TRANSLATE (pScreen, pRegion, -pWin->drawable.x, -pWin->drawable.y);
+ RegionTranslate(pRegion, -pWin->drawable.x, -pWin->drawable.y);
if (!AddResource (stuff->region, RegionResType, (pointer) pRegion))
return BadAlloc;
@@ -558,8 +558,8 @@ CompositeExtensionInit (void) if (!CompositeClientOverlayType)
return;
- if (!dixRequestPrivate(CompositeClientPrivateKey,
- sizeof(CompositeClientRec)))
+ if (!dixRegisterPrivateKey(&CompositeClientPrivateKeyRec, PRIVATE_CLIENT,
+ sizeof(CompositeClientRec)))
return;
if (!AddCallback (&ClientStateCallback, CompositeClientCallback, 0))
|