aboutsummaryrefslogtreecommitdiff
path: root/src/common/util.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2008-01-06 03:16:08 +0000
committerNick Mathewson <nickm@torproject.org>2008-01-06 03:16:08 +0000
commit6d58d80e78d9b6706bda502a9041351f4a619306 (patch)
treef5b0a15ed1e1f212de955e360b06661e47ac0c50 /src/common/util.h
parent864d83059823bbd89c94dcff258f99977b17bcd6 (diff)
downloadtor-6d58d80e78d9b6706bda502a9041351f4a619306.tar
tor-6d58d80e78d9b6706bda502a9041351f4a619306.tar.gz
r17472@catbus: nickm | 2008-01-05 22:10:19 -0500
Another test for the increasingly bad check-spaces style checker to check: #else\n#if is almost a sure sign of a failure to use #elif. Fortunately, we only did that 3 times. svn:r13039
Diffstat (limited to 'src/common/util.h')
-rw-r--r--src/common/util.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/common/util.h b/src/common/util.h
index 1eaad82ec..686350cae 100644
--- a/src/common/util.h
+++ b/src/common/util.h
@@ -39,8 +39,7 @@
* security-critical properties.
*/
#error "Sorry; we don't support building with NDEBUG."
-#else
-#ifdef __GNUC__
+#elif defined(__GNUC__)
/* Give an int-valued version of !x that won't confuse PREDICT_UNLIKELY. */
#define IS_FALSE_AS_INT(x) ((x) == ((typeof(x)) 0))
#else
@@ -57,7 +56,6 @@
_SHORT_FILE_, __LINE__, __func__, #expr); \
abort(); \
} STMT_END
-#endif
#ifdef USE_DMALLOC
#define DMALLOC_PARAMS , const char *file, const int line