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 | 35fbec3719682197130d506e758cab2ce640ef7e (patch) | |
| tree | 0d059febc2ad33fa69719ce514c38777568a04c5 | |
| parent | 7e9f1d6992fd815c973049ed621daacf16ff0201 (diff) | |
| parent | d1ec7bb06e41d6f4b79c5709c6d7be62393939e7 (diff) | |
| download | tor-35fbec3719682197130d506e758cab2ce640ef7e.tar.gz tor-35fbec3719682197130d506e758cab2ce640ef7e.zip | |
Merge branch 'maint-0.3.4' into release-0.3.4
| -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) |