diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-11-21 15:35:06 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-11-21 15:35:06 -0800 |
| commit | e9ada35b4d24abd44bc5d811b59c6f25af5984f4 (patch) | |
| tree | 2c7fd8cab0591eefea2f7dd03b3f24b298d4667d | |
| parent | d483ecd851bb84014f1fa86f0ada4540b3ad801e (diff) | |
Build fix for recent removal of ALLOCATE_LOCAL and DEALLOCATE_LOCAL
| -rw-r--r-- | src/nv_cursor.c | 6 | ||||
| -rw-r--r-- | src/riva_cursor.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/nv_cursor.c b/src/nv_cursor.c index a648f60..abaaab2 100644 --- a/src/nv_cursor.c +++ b/src/nv_cursor.c @@ -135,18 +135,18 @@ TransformCursor (NVPtr pNv) /* convert to color cursor */ if(pNv->alphaCursor) { dwords = 64 * 64; - if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return; + if(!(tmp = xcalloc(dwords * 4))) return; ConvertCursor8888(pNv, pNv->curImage, tmp); } else { dwords = (32 * 32) >> 1; - if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return; + if(!(tmp = xcalloc(dwords * 4))) return; ConvertCursor1555(pNv, pNv->curImage, (CARD16*)tmp); } for(i = 0; i < dwords; i++) pNv->CURSOR[i] = tmp[i]; - DEALLOCATE_LOCAL(tmp); + xfree(tmp); } static void diff --git a/src/riva_cursor.c b/src/riva_cursor.c index b8dc2bf..77a3bfe 100644 --- a/src/riva_cursor.c +++ b/src/riva_cursor.c @@ -72,13 +72,13 @@ RivaTransformCursor (RivaPtr pRiva) int i, dwords; dwords = (32 * 32) >> 1; - if(!(tmp = ALLOCATE_LOCAL(dwords * 4))) return; + if(!(tmp = xcalloc(dwords * 4))) return; RivaConvertCursor1555(pRiva, pRiva->curImage, (CARD16*)tmp); for(i = 0; i < dwords; i++) pRiva->riva.CURSOR[i] = tmp[i]; - DEALLOCATE_LOCAL(tmp); + xfree(tmp); } static void |