summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2014-04-09 19:35:27 -0600
committerBrian Paul <[email protected]>2014-04-10 07:53:12 -0600
commit5206d4bc09a0e2be0e9bb91b4610455af25ca428 (patch)
tree544cdc72c09d8f36c38ea03f3f93f9a5a70739e3
parent7e550503010fa804bfc6dfe2a68d664842c1349c (diff)
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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
-rw-r--r--src/mesa/main/imports.h6
1 files changed, 0 insertions, 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)
/*@}*/