diff options
| author | Simon Glass <sjg@chromium.org> | 2011-06-29 09:49:34 +0000 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-09-10 00:04:01 +0200 |
| commit | 21726a7afce16b882b5cedf70a0c112caea945be (patch) | |
| tree | 8c4e45ababfc547cc27eca5d9ce4d6b1907af2e1 /include/malloc.h | |
| parent | 6a8760d748b432f5c7df01c6d23a3f11c11a6878 (diff) | |
| download | u-boot-21726a7afce16b882b5cedf70a0c112caea945be.tar.gz u-boot-21726a7afce16b882b5cedf70a0c112caea945be.tar.bz2 u-boot-21726a7afce16b882b5cedf70a0c112caea945be.zip | |
Add assert() for debug assertions
assert() is like BUG_ON() but compiles to nothing unless DEBUG is defined.
This is useful when a condition is an error but a board reset is unlikely
to fix it, so it is better to soldier on in hope. Assertion failures should
be caught during development/test.
It turns out that assert() is defined separately in a few places in U-Boot
with various meanings. This patch cleans up some of these.
Build errors exposed by this change (and defining DEBUG) are also fixed in
this patch.
Signed-off-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'include/malloc.h')
| -rw-r--r-- | include/malloc.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/include/malloc.h b/include/malloc.h index 3e145ad11c..ecf3c678fe 100644 --- a/include/malloc.h +++ b/include/malloc.h @@ -285,14 +285,6 @@ extern "C" { */ -#ifdef DEBUG -/* #include <assert.h> */ -#define assert(x) ((void)0) -#else -#define assert(x) ((void)0) -#endif - - /* INTERNAL_SIZE_T is the word-size used for internal bookkeeping of chunk sizes. On a 64-bit machine, you can reduce malloc |