now using GL_MALLOC, GL_FREE

diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 8d9c6e7036084007a3dcae06edf92f48689dfb9e..a9bc00db07774fa706750208c1f13191008e7cf4 100644 (file)
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1,4 +1,4 @@
-/* $Id: context.c,v 1.13 1999/10/10 12:49:36 brianp Exp $ */
+/* $Id: context.c,v 1.14 1999/10/10 13:04:54 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -365,7 +365,7 @@ static struct gl_shared_state *alloc_shared_state( void )
    struct gl_shared_state *ss;
    GLboolean outOfMemory;
 
-   ss = (struct gl_shared_state*) calloc( 1, sizeof(struct gl_shared_state) );
+   ss = GL_CALLOC_STRUCT(gl_shared_state);
    if (!ss)
       return NULL;
 
@@ -1127,7 +1127,7 @@ GLvisual *gl_create_visual( GLboolean rgbFlag,
       return NULL;
    }
 
-   vis = (GLvisual *) calloc( 1, sizeof(GLvisual) );
+   vis = (GLvisual *) GL_CALLOC( sizeof(GLvisual) );
    if (!vis) {
       return NULL;
    }
@@ -1250,7 +1250,7 @@ GLcontext *gl_create_context( GLvisual *visual,
    /* misc one-time initializations */
    one_time_init();
 
-   ctx = (GLcontext *) calloc( 1, sizeof(GLcontext) );
+   ctx = (GLcontext *) GL_CALLOC( sizeof(GLcontext) );
    if (!ctx) {
       return NULL;
    }
@@ -1484,7 +1484,7 @@ GLframebuffer *gl_create_framebuffer( GLvisual *visual )
 {
    GLframebuffer *buffer;
 
-   buffer = (GLframebuffer *) calloc( 1, sizeof(GLframebuffer) );
+   buffer = (GLframebuffer *) GL_CALLOC( sizeof(GLframebuffer) );
    if (!buffer) {
       return NULL;
    }

diff --git a/src/mesa/main/image.c b/src/mesa/main/image.c
index b963d16c9b30a7b9e44d07087dcb0f3de95c60f6..781efad855a2be988c7229f64f8c3eb32e2360a1 100644 (file)
--- a/src/mesa/main/image.c
+++ b/src/mesa/main/image.c
@@ -1,4 +1,4 @@
-/* $Id: image.c,v 1.4 1999/10/10 12:54:04 brianp Exp $ */
+/* $Id: image.c,v 1.5 1999/10/10 13:04:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -483,7 +483,7 @@ GLvoid *gl_pixel_addr_in_image( const struct gl_pixelstore_attrib *packing,
  */
 static struct gl_image *alloc_image( void )
 {
-   return (struct gl_image *) calloc(sizeof(struct gl_image), 1);
+   return GL_CALLOC_STRUCT(gl_image);
 }
 
 

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index b95911613b475e693ab772c89ea2699c575fc3fd..e46b318a44bcea81a707a0c77b00a8adb08e5cc7 100644 (file)
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -1,4 +1,4 @@
-/* $Id: texobj.c,v 1.4 1999/10/09 20:17:07 brianp Exp $ */
+/* $Id: texobj.c,v 1.5 1999/10/10 13:04:17 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -159,7 +159,7 @@ void gl_free_texture_object( struct gl_shared_state *shared,
       }
    }
    /* free this object */
-   free( t );
+   GL_FREE( t );
 }