commit 449d4634bea0ff8f6b29a2826871279dd654f941
author Elliott Hughes <enh@google.com> Thu Aug 16 12:09:13 2012 -0700
committer android code review <noreply-gerritcodereview@google.com> Thu Aug 16 12:09:13 2012 -0700
tree ac36f32a3cd722650d5e27c88af32f7297e08b89
parent ae7280994e7845037b667fd6ebdcb6f299ba1aab
parent 9862f5e08bcbf51c80542fb148fc505df140cb95

Merge "bionic: add macro protection for MALLOC_ALIGNMENT"

libc/bionic/malloc_debug_leak.c

diff --git a/libc/bionic/malloc_debug_leak.c b/libc/bionic/malloc_debug_leak.c
index 316d5fe..4bcf8e5 100644
--- a/libc/bionic/malloc_debug_leak.c
+++ b/libc/bionic/malloc_debug_leak.c
@@ -66,7 +66,9 @@
 // stack trace functions
 // =============================================================================
 
-#define MALLOC_ALIGNMENT    8
+#ifndef MALLOC_ALIGNMENT
+#define MALLOC_ALIGNMENT    ((size_t)8U)
+#endif
 #define GUARD               0x48151642
 #define DEBUG               0