Commit 89f44e05 authored by Stefan Behnel's avatar Stefan Behnel

merge

parents f54625ae da5a0d02
...@@ -5030,8 +5030,7 @@ if Options.gcc_branch_hints: ...@@ -5030,8 +5030,7 @@ if Options.gcc_branch_hints:
""" """
#ifdef __GNUC__ #ifdef __GNUC__
/* Test for GCC > 2.95 */ /* Test for GCC > 2.95 */
#if __GNUC__ > 2 || \ #if __GNUC__ > 2 || (__GNUC__ == 2 && (__GNUC_MINOR__ > 95))
(__GNUC__ == 2 && (__GNUC_MINOR__ > 95))
#define likely(x) __builtin_expect(!!(x), 1) #define likely(x) __builtin_expect(!!(x), 1)
#define unlikely(x) __builtin_expect(!!(x), 0) #define unlikely(x) __builtin_expect(!!(x), 0)
#else /* __GNUC__ > 2 ... */ #else /* __GNUC__ > 2 ... */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment