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

diff --cc src/common/memarea.c
index cfba80be93a403ed57e49c40886577d60fec6670,6c7e4c7d64ee15af426f2001d12cbaef54c3ea24..0a3fd009b0e89181a7d29d98556601d9906391d1
--- 1/src/common/memarea.c
--- 2/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