Commit cd245163 authored by James Zern's avatar James Zern
Browse files

aom_mem.c: remove unnecessary inline

these aren't overly speed critical, best to leave it to the compiler. as
a side-effect this fixes Visual Studio compilation (should have been
INLINE)

Change-Id: Ic81fb5ac76bc19c61efb2f1a965c0f79e9e45ebd
parent cda23457
...@@ -18,21 +18,21 @@ ...@@ -18,21 +18,21 @@
#include "include/aom_mem_intrnl.h" #include "include/aom_mem_intrnl.h"
#include "aom/aom_integer.h" #include "aom/aom_integer.h"
static inline size_t GetAlignedMallocSize(size_t size, size_t align) { static size_t GetAlignedMallocSize(size_t size, size_t align) {
return size + align - 1 + ADDRESS_STORAGE_SIZE; return size + align - 1 + ADDRESS_STORAGE_SIZE;
} }
static inline size_t *GetMallocAddressLocation(void *const mem) { static size_t *GetMallocAddressLocation(void *const mem) {
return ((size_t *)mem) - 1; return ((size_t *)mem) - 1;
} }
static inline void SetActualMallocAddress(void *const mem, static void SetActualMallocAddress(void *const mem,
const void *const malloc_addr) { const void *const malloc_addr) {
size_t *const malloc_addr_location = GetMallocAddressLocation(mem); size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
*malloc_addr_location = (size_t)malloc_addr; *malloc_addr_location = (size_t)malloc_addr;
} }
static inline void *GetActualMallocAddress(void *const mem) { static void *GetActualMallocAddress(void *const mem) {
const size_t *const malloc_addr_location = GetMallocAddressLocation(mem); const size_t *const malloc_addr_location = GetMallocAddressLocation(mem);
return (void *)(*malloc_addr_location); return (void *)(*malloc_addr_location);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment