From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 14 Sep 2016 14:53:49 +0000 (-0400)
Subject: Remove an extraneous parenthesis in IF_BUG_OHNCE__
X-Git-Tag: tor-0.2.9.3-alpha~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b88f918227bf888cf57095aa4c7072491738ac79;p=thirdparty%2Ftor.git

Remove an extraneous parenthesis in IF_BUG_OHNCE__

Fixes bug 20141; bugfix on 0.2.9.1-alpha.

Patch from Gisle Vanem.
---

diff --git a/changes/bug20141 b/changes/bug20141
new file mode 100644
index 0000000000..99ecf0ad62
--- /dev/null
+++ b/changes/bug20141
@@ -0,0 +1,4 @@
+  o Minor bugfixes (compilation):
+    - Fix a syntax error in the IF_BUG_ONCE__() macro in non-
+      GCC-compatible compilers. Fixes bug 20141; bugfix on
+      0.2.9.1-alpha. Patch from Gisle Vanem.
diff --git a/src/common/util_bug.h b/src/common/util_bug.h
index 8b69a47607..e02778110b 100644
--- a/src/common/util_bug.h
+++ b/src/common/util_bug.h
@@ -117,7 +117,7 @@
 #else
 #define IF_BUG_ONCE__(cond,var)                                         \
   static int var = 0;                                                   \
-  if (PREDICT_UNLIKELY(cond)) ?                                         \
+  if (PREDICT_UNLIKELY(cond) ?                                          \
       (var ? 1 :                                                        \
        (var=1,                                                          \
         tor_bug_occurred_(SHORT_FILE__, __LINE__, __func__,             \