From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 12 Apr 2016 17:02:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
X-Git-Tag: tor-0.2.8.3-alpha~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7babf33239eb1e349826753a9d0405cb59150cce;p=thirdparty%2Ftor.git

Merge remote-tracking branch 'public/bug18716_027' into maint-0.2.8
---

7babf33239eb1e349826753a9d0405cb59150cce
diff --cc src/common/memarea.c
index cfba80be93,6c7e4c7d64..0a3fd009b0
--- 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