diff options
author | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-07-22 10:17:30 +0000 |
---|---|---|
committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2021-07-22 10:17:30 +0000 |
commit | ca11beabae33eb59fb981b8adf50b1d47a2a98f0 (patch) | |
tree | 3e4691a396e6e54cd54224a190663d5cf976625b /lib/mesa/src/util/u_memory.h | |
parent | 27c8a50e8bbde7d28b1fc46d715a4c469e24f2c4 (diff) |
Import Mesa 21.1.5
Diffstat (limited to 'lib/mesa/src/util/u_memory.h')
-rw-r--r-- | lib/mesa/src/util/u_memory.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/mesa/src/util/u_memory.h b/lib/mesa/src/util/u_memory.h index dc22ab0fd..4cdccb66a 100644 --- a/lib/mesa/src/util/u_memory.h +++ b/lib/mesa/src/util/u_memory.h @@ -34,7 +34,6 @@ #ifndef U_MEMORY_H #define U_MEMORY_H -#include "util/u_pointer.h" #include "util/u_debug.h" #include "util/os_memory.h" @@ -61,6 +60,7 @@ extern "C" { #define align_malloc(_size, _alignment) os_malloc_aligned(_size, _alignment) #define align_free(_ptr) os_free_aligned(_ptr) +#define align_realloc(_ptr, _oldsize, _newsize, _alignment) os_realloc_aligned(_ptr, _oldsize, _newsize, _alignment) static inline void * align_calloc(size_t size, unsigned long alignment) @@ -75,7 +75,7 @@ align_calloc(size_t size, unsigned long alignment) * Duplicate a block of memory. */ static inline void * -mem_dup(const void *src, uint size) +mem_dup(const void *src, size_t size) { void *dup = MALLOC(size); if (dup) |