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 | feed41bed323713c8064dae210a3869e737e2936 (patch) | |
| tree | 1f6205516b329a587f581f2d7e8b61b1c4f11094 | |
| parent | 23ce9a60fbd93481f855c30e3e550acefc6052a4 (diff) | |
| parent | d1ec7bb06e41d6f4b79c5709c6d7be62393939e7 (diff) | |
| download | tor-feed41bed323713c8064dae210a3869e737e2936.tar.gz tor-feed41bed323713c8064dae210a3869e737e2936.zip | |
Merge branch 'maint-0.3.4'
| -rw-r--r-- | src/lib/log/util_bug.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/log/util_bug.h b/src/lib/log/util_bug.h index 964bc66840..557d932ac3 100644 --- a/src/lib/log/util_bug.h +++ b/src/lib/log/util_bug.h @@ -71,14 +71,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) |