Merge branch 'maint-0.3.3' into maint-0.3.4

This commit is contained in:
Nick Mathewson 2018-10-15 12:47:46 -04:00
commit d1ec7bb06e

View File

@ -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)