diff options
| author | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-05-16 20:50:58 +0000 |
| commit | 1c94119ae26b94a60bb2c2b33494ed43c3b8a52f (patch) | |
| tree | cfe0c736c95314edac7d9f1065be9c13026ed0c1 /xorg-server/composite/compoverlay.c | |
| parent | 6b29aa4559aeb6f795caee047561654bfa0a1954 (diff) | |
| download | vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.gz vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.tar.bz2 vcxsrv-1c94119ae26b94a60bb2c2b33494ed43c3b8a52f.zip | |
svn merge -r588:HEAD ^/branches/released .
Diffstat (limited to 'xorg-server/composite/compoverlay.c')
| -rw-r--r-- | xorg-server/composite/compoverlay.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xorg-server/composite/compoverlay.c b/xorg-server/composite/compoverlay.c index ce6db9977..5846c34c5 100644 --- a/xorg-server/composite/compoverlay.c +++ b/xorg-server/composite/compoverlay.c @@ -66,7 +66,7 @@ compFreeOverlayClient (CompOverlayClientPtr pOcToDel) {
if (pOc == pOcToDel) {
*pPrev = pOc->pNext;
- xfree (pOc);
+ free(pOc);
break;
}
}
@@ -101,7 +101,7 @@ compCreateOverlayClient (ScreenPtr pScreen, ClientPtr pClient) CompScreenPtr cs = GetCompScreen(pScreen);
CompOverlayClientPtr pOc;
- pOc = (CompOverlayClientPtr) xalloc(sizeof(CompOverlayClientRec));
+ pOc = (CompOverlayClientPtr) malloc(sizeof(CompOverlayClientRec));
if (pOc == NULL)
return NULL;
|