projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
radv: add a LLVM version string workaround for SotTR and ACO
[mesa.git]
/
src
/
util
/
u_memory.h
diff --git
a/src/util/u_memory.h
b/src/util/u_memory.h
index dc22ab0fd1a7e05df0bc048bc89be5e1b8925fd1..4cdccb66aaf4b8770b9b7144330fe971ff3f9f72 100644
(file)
--- a/
src/util/u_memory.h
+++ b/
src/util/u_memory.h
@@
-34,7
+34,6
@@
#ifndef U_MEMORY_H
#define U_MEMORY_H
#ifndef U_MEMORY_H
#define U_MEMORY_H
-#include "util/u_pointer.h"
#include "util/u_debug.h"
#include "util/os_memory.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_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)
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 *
* Duplicate a block of memory.
*/
static inline void *
-mem_dup(const void *src,
uin
t size)
+mem_dup(const void *src,
size_
t size)
{
void *dup = MALLOC(size);
if (dup)
{
void *dup = MALLOC(size);
if (dup)