Fix handling of alignment issues

[profile/ivi/syslinux.git] / com32 / lib / malloc.h

diff --git a/com32/lib/malloc.h b/com32/lib/malloc.h
index 57b7652..70d0e63 100644 (file)
--- a/com32/lib/malloc.h
+++ b/com32/lib/malloc.h
@@ -37,10 +37,10 @@ struct arena_header {
 #define ARENA_TYPE_HEAD 2
 #endif
 
-#define ARENA_SIZE_MASK (~(sizeof(struct arena_header)-1))
+#define ARENA_SIZE_MASK (sizeof(struct arena_header)-1)
 
-#define ARENA_ALIGN_UP(p)      ((char *)(((uintptr_t)(p) + ARENA_SIZE_MASK) & ARENA_SIZE_MASK))
-#define ARENA_ALIGN_DOWN(p)    ((char *)((uintptr_t)(p) & ARENA_SIZE_MASK))
+#define ARENA_ALIGN_UP(p)      ((char *)(((uintptr_t)(p) + ARENA_SIZE_MASK) & ~ARENA_SIZE_MASK))
+#define ARENA_ALIGN_DOWN(p)    ((char *)((uintptr_t)(p) & ~ARENA_SIZE_MASK))
 
 /*
  * This structure should be no more than twice the size of the