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 | d1ec7bb06e41d6f4b79c5709c6d7be62393939e7 (patch) | |
| tree | e5d5c24bd10b0bde88c71f9187873c91ec03d703 | |
| parent | 3462f8ed6430bdb1528a7b63aaf2281489eb04d1 (diff) | |
| parent | 86e0be421f14f386327f95df2cea0b3c59323463 (diff) | |
| download | tor-d1ec7bb06e41d6f4b79c5709c6d7be62393939e7.tar.gz tor-d1ec7bb06e41d6f4b79c5709c6d7be62393939e7.zip | |
Merge branch 'maint-0.3.3' into maint-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) |