Commit 86e0be42 authored by Nick Mathewson's avatar Nick Mathewson 🏃
Browse files

Merge branch 'maint-0.2.9' into maint-0.3.3

parents 796e36e5 5b28190c
......@@ -70,14 +70,14 @@
* these macros to just be synonyms for PREDICT_(UN)LIKELY.
*/
#define ASSERT_PREDICT_UNLIKELY_(e) \
({ \
( { \
int tor__assert_tmp_value__; \
if (e) \
tor__assert_tmp_value__ = 1; \
else \
tor__assert_tmp_value__ = 0; \
tor__assert_tmp_value__; \
})
} )
#define ASSERT_PREDICT_LIKELY_(e) ASSERT_PREDICT_UNLIKELY_(e)
#else
#define ASSERT_PREDICT_UNLIKELY_(e) PREDICT_UNLIKELY(e)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment