[Mesa-dev] [PATCH 5/5] mesa: remove the MALLOC, CALLOC and FREE macros

Brian Paul brianp at vmware.com
Wed Apr 9 18:39:17 PDT 2014


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.
---
 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 9e221cc..17a9bd0 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)
 
 /*@}*/
 
-- 
1.7.10.4



More information about the mesa-dev mailing list