From b85cd7b70096cf7c922aed56ae8255fb4b8f0709 Mon Sep 17 00:00:00 2001 From: Michal Krol Date: Sun, 28 Oct 2007 16:36:07 +0000 Subject: [PATCH] Use FREE and MALLOC instead of free and malloc. --- src/mesa/pipe/p_util.h | 2 ++ src/mesa/pipe/softpipe/sp_context.c | 2 +- src/mesa/pipe/softpipe/sp_quad_fs.c | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mesa/pipe/p_util.h b/src/mesa/pipe/p_util.h index 319bb790aea..4f68f5e1bde 100644 --- a/src/mesa/pipe/p_util.h +++ b/src/mesa/pipe/p_util.h @@ -32,6 +32,8 @@ #define CALLOC_STRUCT(T) (struct T *) calloc(1, sizeof(struct T)) +#define MALLOC( SIZE ) malloc( SIZE ) + #define FREE( PTR ) free( PTR ) #define CLAMP( X, MIN, MAX ) ( (X)<(MIN) ? (MIN) : ((X)>(MAX) ? (MAX) : (X)) ) diff --git a/src/mesa/pipe/softpipe/sp_context.c b/src/mesa/pipe/softpipe/sp_context.c index 22493f47036..3a1861cb62f 100644 --- a/src/mesa/pipe/softpipe/sp_context.c +++ b/src/mesa/pipe/softpipe/sp_context.c @@ -227,7 +227,7 @@ static void softpipe_destroy( struct pipe_context *pipe ) softpipe->quad.colormask->destroy( softpipe->quad.colormask ); softpipe->quad.output->destroy( softpipe->quad.output ); - free( softpipe ); + FREE( softpipe ); } diff --git a/src/mesa/pipe/softpipe/sp_quad_fs.c b/src/mesa/pipe/softpipe/sp_quad_fs.c index 81e405d3db5..c4f90e5064b 100644 --- a/src/mesa/pipe/softpipe/sp_quad_fs.c +++ b/src/mesa/pipe/softpipe/sp_quad_fs.c @@ -212,8 +212,8 @@ struct quad_stage *sp_quad_shade_stage( struct softpipe_context *softpipe ) uint i; /* allocate storage for program inputs/outputs, aligned to 16 bytes */ - qss->inputs = malloc(PIPE_ATTRIB_MAX * sizeof(*qss->inputs) + 16); - qss->outputs = malloc(PIPE_ATTRIB_MAX * sizeof(*qss->outputs) + 16); + qss->inputs = MALLOC(PIPE_ATTRIB_MAX * sizeof(*qss->inputs) + 16); + qss->outputs = MALLOC(PIPE_ATTRIB_MAX * sizeof(*qss->outputs) + 16); qss->machine.Inputs = align16(qss->inputs); qss->machine.Outputs = align16(qss->outputs); -- 2.30.2