diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-01-06 16:25:49 +0100 |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2016-01-06 10:33:04 -0500 |
| commit | b44fba25fbad89c105795a10a569fe422e4d1c44 (patch) | |
| tree | 00180788a00743baa98f1c84f53023b6f2ba12e7 /glib | |
| parent | e91e811f020569fe3dae876ffa704fd3e452a33b (diff) | |
| download | glib-b44fba25fbad89c105795a10a569fe422e4d1c44.tar.gz | |
G_LIKELY/_UNLIKELY macros need more parentheses
...for cases like
#include "glib.h"
#define COMMA ,
void f(void) { if (G_LIKELY(0 COMMA 1)); }
https://bugzilla.gnome.org/show_bug.cgi?id=760215
Diffstat (limited to 'glib')
| -rw-r--r-- | glib/gmacros.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/gmacros.h b/glib/gmacros.h index 9b057ceb0..22edb2ef6 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -354,8 +354,8 @@ _g_boolean_var_ = 0; \ _g_boolean_var_; \ }) -#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 1)) -#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR(expr), 0)) +#define G_LIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR((expr)), 1)) +#define G_UNLIKELY(expr) (__builtin_expect (_G_BOOLEAN_EXPR((expr)), 0)) #else #define G_LIKELY(expr) (expr) #define G_UNLIKELY(expr) (expr) |