diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 1999-10-13 18:49:47 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 1999-10-13 18:49:47 +0000 |
| commit | 80af3614d88c0cac160e787de7f34b37e96cb626 (patch) | |
| tree | 93f6d450fe2a907553225468e0fdf896a22bc656 /src/mesa/drivers/x11 | |
| parent | bd5cdaf4442872d3cd2ff94eeafadd481d27fcfb (diff) | |
now using MALLOC, CALLOC, FREE, etc macros
Diffstat (limited to 'src/mesa/drivers/x11')
| -rw-r--r-- | src/mesa/drivers/x11/fakeglx.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/xfonts.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c index c15f1ef88d..3dd0f6c250 100644 --- a/src/mesa/drivers/x11/fakeglx.c +++ b/src/mesa/drivers/x11/fakeglx.c @@ -1,4 +1,4 @@ -/* $Id: fakeglx.c,v 1.8 1999/09/16 16:44:37 brianp Exp $ */ +/* $Id: fakeglx.c,v 1.9 1999/10/13 18:49:47 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -812,7 +812,7 @@ static XVisualInfo *choose_x_overlay_visual( Display *dpy, int scr, if (deepvis==NULL || vislist->depth > deepest) { /* YES! found a satisfactory visual */ if (deepvis) { - free( deepvis ); + XFree( deepvis ); } deepest = vislist->depth; deepvis = vislist; diff --git a/src/mesa/drivers/x11/xfonts.c b/src/mesa/drivers/x11/xfonts.c index c0e0a5fcd0..8745276123 100644 --- a/src/mesa/drivers/x11/xfonts.c +++ b/src/mesa/drivers/x11/xfonts.c @@ -1,4 +1,4 @@ -/* $Id: xfonts.c,v 1.1 1999/08/19 00:55:42 jtg Exp $ */ +/* $Id: xfonts.c,v 1.2 1999/10/13 18:49:47 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -257,7 +257,7 @@ void Fake_glXUseXFont( Font font, int first, int count, int listbase ) max_bm_width = (max_width + 7) / 8; max_bm_height = max_height; - bm = (GLubyte *) malloc ((max_bm_width * max_bm_height) * sizeof + bm = (GLubyte *) MALLOC((max_bm_width * max_bm_height) * sizeof (GLubyte)); if (!bm) { XFreeFontInfo( NULL, fs, 0 ); |