diff options
| author | Brian Paul <[email protected]> | 1999-10-13 18:49:47 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 1999-10-13 18:49:47 +0000 |
| commit | 80af3614d88c0cac160e787de7f34b37e96cb626 (patch) | |
| tree | 93f6d450fe2a907553225468e0fdf896a22bc656 /src/mesa/drivers/glide/fxwgl.c | |
| parent | bd5cdaf4442872d3cd2ff94eeafadd481d27fcfb (diff) | |
now using MALLOC, CALLOC, FREE, etc macros
Diffstat (limited to 'src/mesa/drivers/glide/fxwgl.c')
| -rw-r--r-- | src/mesa/drivers/glide/fxwgl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/drivers/glide/fxwgl.c b/src/mesa/drivers/glide/fxwgl.c index f7f4bdba515..3ba7f7a4b4d 100644 --- a/src/mesa/drivers/glide/fxwgl.c +++ b/src/mesa/drivers/glide/fxwgl.c @@ -351,7 +351,7 @@ HGLRC GLAPIENTRY wglCreateContext(HDC hdc) hDC = GetDC(dibWnd); - dibBMI = (BITMAPINFO*) malloc( sizeof(BITMAPINFO) + (256*sizeof(RGBQUAD))); + dibBMI = (BITMAPINFO*) MALLOC( sizeof(BITMAPINFO) + (256*sizeof(RGBQUAD))); memset(dibBMI,0,sizeof(BITMAPINFO) + (256*sizeof(RGBQUAD))); @@ -429,7 +429,7 @@ BOOL GLAPIENTRY wglDeleteContext(HGLRC hglrc) if(ctx && hglrc == (HGLRC)1) { if (gdiWindowHackEna) { DeleteObject(dibHBM); - free(dibBMI); + FREE(dibBMI); dibSurfacePtr = NULL; dibBMI = NULL; @@ -584,7 +584,7 @@ BOOL GLAPIENTRY wglUseFontBitmaps(HDC fontDevice, DWORD firstChar, DWORD numChar // Convert the display dependant representation to a 1 bit deep DIB numBytes = (bmapWidth * bmapHeight) / 8; - bmap = malloc(numBytes); + bmap = MALLOC(numBytes); dibInfo->bmiHeader.biWidth = bmapWidth; dibInfo->bmiHeader.biHeight = bmapHeight; res = GetDIBits(bitDevice, bitObject, 0, bmapHeight, bmap, @@ -604,13 +604,13 @@ BOOL GLAPIENTRY wglUseFontBitmaps(HDC fontDevice, DWORD firstChar, DWORD numChar DeleteObject(bitObject); // Deallocate the bitmap data - free(bmap); + FREE(bmap); } // Destroy the DC VERIFY(DeleteDC(bitDevice)); - free(dibInfo); + FREE(dibInfo); return TRUE; #undef VERIFY |