diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2020-08-26 05:30:39 +0000 |
| commit | 27c93456b58343162f7c4ad20ca6bea0c9a91646 (patch) | |
| tree | 945c20b63e0b9975ee40f114c5312f8d8f1a2d0b /lib/mesa/src/util/os_memory.h | |
| parent | 875b83a3ee95e248388fbf72271acc80f6f97987 (diff) | |
Import Mesa 20.1.6
Diffstat (limited to 'lib/mesa/src/util/os_memory.h')
| -rw-r--r-- | lib/mesa/src/util/os_memory.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/lib/mesa/src/util/os_memory.h b/lib/mesa/src/util/os_memory.h index 7a67e440d..b191cf205 100644 --- a/lib/mesa/src/util/os_memory.h +++ b/lib/mesa/src/util/os_memory.h @@ -34,8 +34,6 @@ #ifndef _OS_MEMORY_H_ #define _OS_MEMORY_H_ -#include "detect_os.h" - #if defined(EMBEDDED_DEVICE) #ifdef __cplusplus @@ -60,14 +58,13 @@ os_malloc_aligned(size_t size, size_t alignment); void os_free_aligned(void *ptr); +void * +os_realloc_aligned(void *ptr, size_t oldsize, size_t newsize, size_t alignemnt); + #ifdef __cplusplus } #endif -#elif DETECT_OS_WINDOWS && defined(DEBUG) && !defined(DEBUG_MEMORY_IMPLEMENTATION) - -# include "os_memory_debug.h" - #else # include "os_memory_stdc.h" |