vpx_mem,align_addr: use ~ to create mask

removes the need for an intermediate cast to int, which was missing in
the call added in:
69c5ba1 vpx_mem: Refactor code

quiets a visual studio warning:
C4146: unary minus operator applied to unsigned type, result still
unsigned

Change-Id: I76c4003416759c6c76b78f74de7c0d2ba5071216
This commit is contained in:
James Zern 2016-08-27 10:34:40 -07:00
parent a19b9b6185
commit 19d881290d
2 changed files with 2 additions and 2 deletions

View File

@ -26,6 +26,6 @@
/*returns an addr aligned to the byte boundary specified by align*/
#define align_addr(addr, align) \
(void *)(((size_t)(addr) + ((align)-1)) & (size_t) - (align))
(void *)(((size_t)(addr) + ((align)-1)) & ~(size_t)((align)-1))
#endif // VPX_MEM_INCLUDE_VPX_MEM_INTRNL_H_

View File

@ -59,7 +59,7 @@ void *vpx_memalign(size_t align, size_t size) {
addr = malloc((size_t)aligned_size);
if (addr) {
x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, (int)align);
x = align_addr((unsigned char *)addr + ADDRESS_STORAGE_SIZE, align);
set_actual_malloc_address(x, addr);
}
return x;