From 9862f5e08bcbf51c80542fb148fc505df140cb95 Mon Sep 17 00:00:00 2001
From: Jin Wei <wei.a.jin@intel.com>
Date: Wed, 1 Aug 2012 14:48:57 +0800
Subject: [PATCH] bionic: add macro protection for MALLOC_ALIGNMENT

In previous commit: 2fd81ef7, .mk file has been modified to
configure MALLOC_ALIGNMENT dynamicly according to board config.
Add the missing macor protection here.

Change-Id: I703cca2ce0504ab3e11aab226b2c61fcc0c6afa1
Author: Jin Wei <wei.a.jin@intel.com>
Signed-off-by: Xiaokang Qin <xiaokang.qin@intel.com>
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Jack Ren <jack.ren@intel.com>
---
 libc/bionic/malloc_debug_leak.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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