aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2011-09-10 16:04:12 +0200
committerWolfgang Denk <wd@denx.de>2011-09-10 16:05:43 +0200
commitea95cb73310c075e4f2e05e2ffb4443cac1825cd (patch)
tree742a8524d49a8bd0ee43cd48e3cf6380e7b45e6a
parentaaf6935b223ccf746d1504661d2c40bf73698d3b (diff)
downloadu-boot-linaro-stable-ea95cb73310c075e4f2e05e2ffb4443cac1825cd.tar.gz
utx8245: fix build breakage due to assert()
Commit 21726a7 "Add assert() for debug assertions" broke building the utx8245 board: dlmalloc.c: In function 'do_check_chunk': dlmalloc.c:1660: error: 'sz' undeclared (first use in this function) dlmalloc.c:1660: error: (Each undeclared identifier is reported only once dlmalloc.c:1660: error: for each function it appears in.) dlmalloc.c: In function 'do_check_free_chunk': dlmalloc.c:1689: error: 'next' undeclared (first use in this function) dlmalloc.c: In function 'do_check_malloced_chunk': dlmalloc.c:1748: error: 'sz' undeclared (first use in this function) dlmalloc.c:1750: error: 'room' undeclared (first use in this function) Signed-off-by: Wolfgang Denk <wd@denx.de> Cc: Simon Glass <sjg@chromium.org>
-rw-r--r--common/dlmalloc.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/common/dlmalloc.c b/common/dlmalloc.c
index f2080c64b..c645d7314 100644
--- a/common/dlmalloc.c
+++ b/common/dlmalloc.c
@@ -1647,9 +1647,7 @@ static void do_check_chunk(mchunkptr p)
static void do_check_chunk(p) mchunkptr p;
#endif
{
-#if 0 /* causes warnings because assert() is off */
INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-#endif /* 0 */
/* No checkable chunk is mmapped */
assert(!chunk_is_mmapped(p));
@@ -1671,9 +1669,7 @@ static void do_check_free_chunk(p) mchunkptr p;
#endif
{
INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
-#if 0 /* causes warnings because assert() is off */
mchunkptr next = chunk_at_offset(p, sz);
-#endif /* 0 */
do_check_chunk(p);
@@ -1737,10 +1733,8 @@ static void do_check_malloced_chunk(mchunkptr p, INTERNAL_SIZE_T s)
static void do_check_malloced_chunk(p, s) mchunkptr p; INTERNAL_SIZE_T s;
#endif
{
-#if 0 /* causes warnings because assert() is off */
INTERNAL_SIZE_T sz = p->size & ~PREV_INUSE;
long room = sz - s;
-#endif /* 0 */
do_check_inuse_chunk(p);