Browse Source

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

Nick Mathewson 8 years ago
parent
commit
7babf33239
2 changed files with 6 additions and 2 deletions
  1. 4 0
      changes/bug18716
  2. 2 2
      src/common/memarea.c

+ 4 - 0
changes/bug18716

@@ -0,0 +1,4 @@
+  o Minor bugfixes (assert, portability):
+    - Fix an assertion failure in memarea.c on systems where "long" is
+      shorter than the size of a pointer.
+      Fixes bug 18716; bugfix on 0.2.1.1-alpha

+ 2 - 2
src/common/memarea.c

@@ -24,9 +24,9 @@
 /** 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