diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-12-18 17:19:46 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-12-18 17:19:46 -0800 |
| commit | 3111ae93268b1af36e469b1f7744e821f27f0a30 (patch) | |
| tree | 0c6282fe70d9f0df38ec5136a046ce14311c0d42 /lib/zassert.h | |
| parent | 0b49f5d475aa5503e60d8dbdc9b4dcc8f6a614ec (diff) | |
| parent | 177fec0b82d18dc92fe40b51bf1a4a294fb9a7ff (diff) | |
| download | quagga-3111ae93268b1af36e469b1f7744e821f27f0a30.tar.bz2 quagga-3111ae93268b1af36e469b1f7744e821f27f0a30.tar.xz | |
Merge branch 'jenner' of suva.vyatta.com:/git/vyatta-quagga into jenner
Diffstat (limited to 'lib/zassert.h')
| -rw-r--r-- | lib/zassert.h | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/lib/zassert.h b/lib/zassert.h index 123aee16..c5892b8c 100644 --- a/lib/zassert.h +++ b/lib/zassert.h @@ -9,14 +9,6 @@ extern void _zlog_assert_failed (const char *assertion, const char *file, unsigned int line, const char *function) __attribute__ ((noreturn)); -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#define __ASSERT_FUNCTION __func__ -#elif defined(__GNUC__) -#define __ASSERT_FUNCTION __FUNCTION__ -#else -#define __ASSERT_FUNCTION NULL -#endif - #ifdef __GNUC__ #define UNLIKELY(EX) __builtin_expect(!!(EX), 0) #define LIKELY(EX) __builtin_expect(!!(EX), 1) @@ -25,9 +17,9 @@ extern void _zlog_assert_failed (const char *assertion, const char *file, #define LIKELY(EX) (EX) #endif -#define zassert(EX) ((void)(UNLIKELY(EX) ? 0 : \ - (_zlog_assert_failed(#EX, __FILE__, __LINE__, \ - __ASSERT_FUNCTION), 0))) +#define zassert(EX) ((void)(LIKELY(EX) ? 0 : \ + _zlog_assert_failed(#EX, __FILE__, __LINE__, \ + __func__))) #undef assert #define assert(EX) zassert(EX) |