summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2013-09-06 18:20:10 -0700
committerJames Zern <jzern@google.com>2013-09-06 19:11:51 -0700
commitfb550ee620f9a2d29e0c8d24c1b0a5c305af775a (patch)
tree610d9f9c422f589165b38433e0f06e39b56d7d41
parentd1268c592183db41d6586029a333eee155449d85 (diff)
downloadlibvpx-fb550ee620f9a2d29e0c8d24c1b0a5c305af775a.tar
libvpx-fb550ee620f9a2d29e0c8d24c1b0a5c305af775a.tar.gz
libvpx-fb550ee620f9a2d29e0c8d24c1b0a5c305af775a.tar.bz2
libvpx-fb550ee620f9a2d29e0c8d24c1b0a5c305af775a.zip
vpx_mem: increase default alignment
this prevents returning an address smaller than the natural heap alignment from vpx_malloc on e.g., x86_64 Change-Id: I283e858664a8529f28b22060c3815116a7798c0d
-rw-r--r--vpx_mem/include/vpx_mem_intrnl.h6
1 files changed, 1 insertions, 5 deletions
diff --git a/vpx_mem/include/vpx_mem_intrnl.h b/vpx_mem/include/vpx_mem_intrnl.h
index 60b5165f3..2248ad566 100644
--- a/vpx_mem/include/vpx_mem_intrnl.h
+++ b/vpx_mem/include/vpx_mem_intrnl.h
@@ -50,14 +50,10 @@ vpx_memcpy, _memset, and _memmove*/
calls to vpx_* functions other
than vpx_memalign*/
# else
-# define DEFAULT_ALIGNMENT 1
+# define DEFAULT_ALIGNMENT (2 * sizeof(void*)) /* NOLINT */
# endif
#endif
-#if DEFAULT_ALIGNMENT < 1
-# error "DEFAULT_ALIGNMENT must be >= 1!"
-#endif
-
#if CONFIG_MEM_TRACKER
# define TRY_BOUNDS_CHECK 1 /*when set to 1 pads each allocation,
integrity can be checked using