Merge pull request #282 from larsmans/simplify-branch-prediction_macros

simplify test for GCC >= 2.95 for branch prediction

Merge pull request #282 from larsmans/simplify-branch-prediction_macros
simplify test for GCC >= 2.95 for branch prediction
e0c7b9d0 · scoder · d9712297 · 2db8c147 · e0c7b9d0
Commit e0c7b9d0 authored Mar 11, 2014 by scoder
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 10 deletions

Cython/Compiler/Nodes.py Cython/Compiler/Nodes.py +6 -10

No files found.
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -8212,16 +8212,12 @@ class CnameDecoratorNode(StatNode):

 if Options.gcc_branch_hints:
    branch_prediction_macros = """
-#ifdef __GNUC__
-  /* Test for GCC > 2.95 */
-  #if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95))
-    #define likely(x)   __builtin_expect(!!(x), 1)
-    #define unlikely(x) __builtin_expect(!!(x), 0)
-  #else /* __GNUC__ > 2 ... */
-    #define likely(x)   (x)
-    #define unlikely(x) (x)
-  #endif /* __GNUC__ > 2 ... */
-#else /* __GNUC__ */
+/* Test for GCC > 2.95 */
+#if defined(__GNUC__) \
+    && (__GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95)))
+  #define likely(x)   __builtin_expect(!!(x), 1)
+  #define unlikely(x) __builtin_expect(!!(x), 0)
+#else /* !__GNUC__ or GCC < 2.95 */
  #define likely(x)   (x)
  #define unlikely(x) (x)
 #endif /* __GNUC__ */