diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-09 13:22:00 -0800 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-02-09 13:22:00 -0800 |
| commit | 36c9799e43c48394008c770ba283387a63c8e6af (patch) | |
| tree | 2d1bafe4873887eba030d813795735aa31a2aae2 | |
| parent | 86a3d4117c6b959bfed2bf4ceb2500e046c44f18 (diff) | |
| download | quagga-36c9799e43c48394008c770ba283387a63c8e6af.tar.bz2 quagga-36c9799e43c48394008c770ba283387a63c8e6af.tar.xz | |
revert: don't bother with gcc builtin_expect()
Doesn't really help and unlikely to get upstream (pun intended).
| -rw-r--r-- | lib/zassert.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/zassert.h b/lib/zassert.h index c5892b8c..79126760 100644 --- a/lib/zassert.h +++ b/lib/zassert.h @@ -9,17 +9,17 @@ extern void _zlog_assert_failed (const char *assertion, const char *file, unsigned int line, const char *function) __attribute__ ((noreturn)); -#ifdef __GNUC__ -#define UNLIKELY(EX) __builtin_expect(!!(EX), 0) -#define LIKELY(EX) __builtin_expect(!!(EX), 1) +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#define __ASSERT_FUNCTION __func__ +#elif defined(__GNUC__) +#define __ASSERT_FUNCTION __FUNCTION__ #else -#define UNLIKELY(EX) (EX) -#define LIKELY(EX) (EX) +#define __ASSERT_FUNCTION NULL #endif -#define zassert(EX) ((void)(LIKELY(EX) ? 0 : \ - _zlog_assert_failed(#EX, __FILE__, __LINE__, \ - __func__))) +#define zassert(EX) ((void)((EX) ? 0 : \ + (_zlog_assert_failed(#EX, __FILE__, __LINE__, \ + __ASSERT_FUNCTION), 0))) #undef assert #define assert(EX) zassert(EX) |