diff options
| author | Scott Branden <sbranden@users.noreply.github.com> | 2017-04-29 08:36:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 08:36:12 -0700 |
| commit | 0f22bef31d402e24fab77eb2a3c643d042b7e79c (patch) | |
| tree | 6595ed7f87249ccbd4a953ba5cdc00963a130d18 /include/lib/stdlib/assert.h | |
| parent | 53d9c9c85bc49845c4c40315e1ab29d627a1f8c3 (diff) | |
| parent | dd454b40dfe42dbf77e2f04a3965295380b4f78d (diff) | |
Merge branch 'integration' into tf_issue_461
Diffstat (limited to 'include/lib/stdlib/assert.h')
| -rw-r--r-- | include/lib/stdlib/assert.h | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/include/lib/stdlib/assert.h b/include/lib/stdlib/assert.h index 5621f8ca..1bcd1ead 100644 --- a/include/lib/stdlib/assert.h +++ b/include/lib/stdlib/assert.h @@ -34,30 +34,27 @@ * @(#)assert.h 8.2 (Berkeley) 1/21/94 * $FreeBSD$ */ - -#include <sys/cdefs.h> - /* - * Unlike other ANSI header files, <assert.h> may usefully be included - * multiple times, with and without NDEBUG defined. + * Portions copyright (c) 2017, ARM Limited and Contributors. + * All rights reserved. */ -#undef assert -#undef _assert +#ifndef _ASSERT_H_ +#define _ASSERT_H_ -#ifdef NDEBUG -#define assert(e) ((void)0) -#define _assert(e) ((void)0) -#else -#define _assert(e) assert(e) +#include <sys/cdefs.h> +#if ENABLE_ASSERTIONS +#define _assert(e) assert(e) #define assert(e) ((e) ? (void)0 : __assert(__func__, __FILE__, \ __LINE__, #e)) -#endif /* NDEBUG */ +#else +#define assert(e) ((void)0) +#define _assert(e) ((void)0) +#endif /* ENABLE_ASSERTIONS */ -#ifndef _ASSERT_H_ -#define _ASSERT_H_ __BEGIN_DECLS void __assert(const char *, const char *, int, const char *) __dead2; __END_DECLS + #endif /* !_ASSERT_H_ */ |