commit 86e0be421f14f386327f95df2cea0b3c59323463
parent 796e36e535d1713fd1168772669199ea9189ba61
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 15 Oct 2018 12:47:46 -0400
Merge branch 'maint-0.2.9' into maint-0.3.3
Diffstat:
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/common/util_bug.h b/src/common/util_bug.h
@@ -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)