diff options
Diffstat (limited to 'src/common/util.h')
| -rw-r--r-- | src/common/util.h | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/common/util.h b/src/common/util.h index 4f8182949..e8d78c984 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -41,18 +41,10 @@ #error "Sorry; we don't support building with NDEBUG." #endif -#if defined(__GNUC__) -/* Give an int-valued version of !x that won't confuse PREDICT_UNLIKELY, - * which does poorly with pointer types on some versions of glibc. */ -#define IS_FALSE_AS_INT(x) ((x) == ((typeof(x)) 0)) -#else -#define IS_FALSE_AS_INT(x) !(x) -#endif - /** Like assert(3), but send assertion failures to the log as well as to * stderr. */ #define tor_assert(expr) STMT_BEGIN \ - if (PREDICT_UNLIKELY(IS_FALSE_AS_INT(expr))) { \ + if (PREDICT_UNLIKELY(!(expr))) { \ log(LOG_ERR, LD_BUG, "%s:%d: %s: Assertion %s failed; aborting.", \ _SHORT_FILE_, __LINE__, __func__, #expr); \ fprintf(stderr,"%s:%d %s: Assertion %s failed; aborting.\n", \ |