nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.2.9' into maint-0.3.3

Browse Source
This commit is contained in:
Nick Mathewson 2018-10-15 12:47:46 -04:00
commit 86e0be421f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common/util_bug.h
View File

@ -70,14 +70,14 @@
* these macros to just be synonyms for PREDICT_(UN)LIKELY. * these macros to just be synonyms for PREDICT_(UN)LIKELY.
*/ */
#define ASSERT_PREDICT_UNLIKELY_(e) \ #define ASSERT_PREDICT_UNLIKELY_(e) \
({ \ ( { \
int tor__assert_tmp_value__; \ int tor__assert_tmp_value__; \
if (e) \ if (e) \
tor__assert_tmp_value__ = 1; \ tor__assert_tmp_value__ = 1; \
else \ else \
tor__assert_tmp_value__ = 0; \ tor__assert_tmp_value__ = 0; \
tor__assert_tmp_value__; \ tor__assert_tmp_value__; \
}) } )
#define ASSERT_PREDICT_LIKELY_(e) ASSERT_PREDICT_UNLIKELY_(e) #define ASSERT_PREDICT_LIKELY_(e) ASSERT_PREDICT_UNLIKELY_(e)
#else #else
#define ASSERT_PREDICT_UNLIKELY_(e) PREDICT_UNLIKELY(e) #define ASSERT_PREDICT_UNLIKELY_(e) PREDICT_UNLIKELY(e)