From: Marek Olšák <marek.olsak@amd.com>
Date: Thu, 26 Mar 2020 03:47:36 +0000 (-0400)
Subject: util: remove duplicated MALLOC_STRUCT and CALLOC_STRUCT
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=871bd2819d51bf9720d2ff57522ec31f254431a5;p=mesa.git

util: remove duplicated MALLOC_STRUCT and CALLOC_STRUCT

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com
Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4324>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4324>
---

diff --git a/src/util/imports.h b/src/util/imports.h
index 1e547c3a787..4ebae04ffc7 100644
--- a/src/util/imports.h
+++ b/src/util/imports.h
@@ -41,24 +41,13 @@
 #include <string.h>
 #include "util/compiler.h"
 #include "util/bitscan.h"
+#include "util/u_memory.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 
-/**********************************************************************/
-/** Memory macros */
-/*@{*/
-
-/** 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))
-
-/*@}*/
-
-
 /*
  * For GL_ARB_vertex_buffer_object we need to treat vertex array pointers
  * as offsets into buffer stores.  Since the vertex array pointer and