diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-10-15 12:47:46 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-10-15 12:47:46 -0400 |
| commit | 86e0be421f14f386327f95df2cea0b3c59323463 (patch) | |
| tree | 875e112e0a9b63f3162dd5c6a8dd74404e981e89 /src | |
| parent | 796e36e535d1713fd1168772669199ea9189ba61 (diff) | |
| parent | 5b28190c67ac6828e588c0ec54fe88eab0fb45fb (diff) | |
| download | tor-86e0be421f14f386327f95df2cea0b3c59323463.tar.gz tor-86e0be421f14f386327f95df2cea0b3c59323463.zip | |
Merge branch 'maint-0.2.9' into maint-0.3.3
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/util_bug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/common/util_bug.h b/src/common/util_bug.h index be0001e849..50becd0c33 100644 --- 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) |