From cd24516347e843e4ee2023f11ae0b8ae55eaa3e9 Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 6 Sep 2016 23:24:01 -0700 Subject: [PATCH] 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 --- aom_mem/aom_mem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/aom_mem/aom_mem.c b/aom_mem/aom_mem.c index 38350c69e..144085f22 100644 --- a/aom_mem/aom_mem.c +++ b/aom_mem/aom_mem.c @@ -18,21 +18,21 @@ #include "include/aom_mem_intrnl.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; } -static inline size_t *GetMallocAddressLocation(void *const mem) { +static size_t *GetMallocAddressLocation(void *const mem) { return ((size_t *)mem) - 1; } -static inline void SetActualMallocAddress(void *const mem, - const void *const malloc_addr) { +static void SetActualMallocAddress(void *const mem, + const void *const malloc_addr) { size_t *const malloc_addr_location = GetMallocAddressLocation(mem); *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); return (void *)(*malloc_addr_location); } -- 2.50.1