tor

The Tor anonymity network
git clone https://git.dasho.dev/tor.git
Log | Files | Refs | README | LICENSE

commit d1ec7bb06e41d6f4b79c5709c6d7be62393939e7
parent 3462f8ed6430bdb1528a7b63aaf2281489eb04d1
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 15 Oct 2018 12:47:46 -0400

Merge branch 'maint-0.3.3' into maint-0.3.4

Diffstat:
Msrc/common/util_bug.h | 4++--
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)