From 5206d4bc09a0e2be0e9bb91b4610455af25ca428 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 9 Apr 2014 19:35:27 -0600 Subject: [PATCH] mesa: remove the MALLOC, CALLOC and FREE macros No longer used anywhere. These also caused trouble in the Gallium state tracker code where we include both core Mesa and Gallium util headers (and the macros were defined differently in each world.) Removing these macros should help avoid macro mix-ups in the future. Reviewed-by: Jakob Bornecrantz Reviewed-by: Kenneth Graunke --- src/mesa/main/imports.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/mesa/main/imports.h b/src/mesa/main/imports.h index 9e221cccb1e..17a9bd09986 100644 --- a/src/mesa/main/imports.h +++ b/src/mesa/main/imports.h @@ -49,16 +49,10 @@ extern "C" { /** Memory macros */ /*@{*/ -/** Allocate \p BYTES bytes */ -#define MALLOC(BYTES) malloc(BYTES) -/** Allocate and zero \p BYTES bytes */ -#define CALLOC(BYTES) calloc(1, BYTES) /** Allocate a structure of type \p T */ #define MALLOC_STRUCT(T) (struct T *) malloc(sizeof(struct T)) /** Allocate and zero a structure of type \p T */ #define CALLOC_STRUCT(T) (struct T *) calloc(1, sizeof(struct T)) -/** Free memory */ -#define FREE(PTR) free(PTR) /*@}*/ -- 2.30.2