diff options
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/conf_post.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d679a0ae9c9..e6901fd8680 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2013-09-22 Jan Djärv <jan.h.d@swipnet.se> + + * conf_post.h (assume): Fix compiler error: x shall be cond. + 2013-09-22 Daniel Colascione <dancol@dancol.org> * xfns.c (x_get_monitor_attributes): Suppress unused variable diff --git a/src/conf_post.h b/src/conf_post.h index 5f6cf0eca37..14af38ce70b 100644 --- a/src/conf_post.h +++ b/src/conf_post.h @@ -253,7 +253,7 @@ extern void _DebPrint (const char *fmt, ...); #if defined lint # define assume(cond) ((cond) ? (void) 0 : abort ()) #elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4 -# define assume(cond) ((x) || (__builtin_unreachable(), 0)) +# define assume(cond) ((cond) || (__builtin_unreachable(), 0)) #elif defined __MSC_VER # define assume(cond) __assume ((cond)) #else |