commit 7babf33239eb1e349826753a9d0405cb59150cce Merge: 40827da 39c057d Author: Nick Mathewson <nickm@torproject.org> Date: Tue Apr 12 13:02:02 2016 -0400 Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8 changes/bug18716 | 4 ++++ src/common/memarea.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --cc src/common/memarea.c index cfba80b,6c7e4c7..0a3fd00 --- a/src/common/memarea.c +++ b/src/common/memarea.c @@@ -21,12 -21,10 +21,12 @@@ * value. */ #define MEMAREA_ALIGN SIZEOF_VOID_P +/** A value which, when masked out of a pointer, produces a maximally aligned + * pointer. */ #if MEMAREA_ALIGN == 4 - #define MEMAREA_ALIGN_MASK 3lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)3) #elif MEMAREA_ALIGN == 8 - #define MEMAREA_ALIGN_MASK 7lu + #define MEMAREA_ALIGN_MASK ((uintptr_t)7) #else #error "void* is neither 4 nor 8 bytes long. I don't know how to align stuff." #endif