diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2007-11-05 19:08:36 -0500 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-charon.epoch.ncsc.mil> | 2007-11-05 19:08:36 -0500 |
| commit | a52c9b2a59f27266557ff9d5d2c08492e04135a6 (patch) | |
| tree | 705f11c54e8a31a07dde9ab6835032e2849e132b /hw/xfree86/shadowfb | |
| parent | c7e18beb3c87eb1ada9b21c4ffacd11c1939c087 (diff) | |
| parent | 58332894c061ae96d6a457f65266660f5f65e88b (diff) | |
Merge branch 'master' into XACE-SELINUX
Conflicts:
dix/dispatch.c
dix/property.c
hw/xfree86/common/xf86VidMode.c
include/xkbsrv.h
render/glyph.c
xkb/xkbActions.c
Diffstat (limited to 'hw/xfree86/shadowfb')
| -rw-r--r-- | hw/xfree86/shadowfb/shadow.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index c3bd61c1e..74beefb67 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -1027,7 +1027,7 @@ ShadowPolyRectangle( offset1 = offset2 >> 1; offset3 = offset2 - offset1; - pBoxInit = (BoxPtr)ALLOCATE_LOCAL(nRects * 4 * sizeof(BoxRec)); + pBoxInit = (BoxPtr)xalloc(nRects * 4 * sizeof(BoxRec)); pbox = pBoxInit; while(nRects--) { @@ -1078,7 +1078,7 @@ ShadowPolyRectangle( if(pPriv->preRefresh) (*pPriv->preRefresh)(pPriv->pScrn, num, pBoxInit); } else { - DEALLOCATE_LOCAL(pBoxInit); + xfree(pBoxInit); } } } @@ -1090,7 +1090,7 @@ ShadowPolyRectangle( } else if(num) { if(pPriv->postRefresh) (*pPriv->postRefresh)(pPriv->pScrn, num, pBoxInit); - DEALLOCATE_LOCAL(pBoxInit); + xfree(pBoxInit); } SHADOW_GC_OP_EPILOGUE(pGC); |