From: Jan Djärv Date: Sun, 22 Sep 2013 11:07:17 +0000 (+0200) Subject: * conf_post.h (assume): Fix compiler error: x shall be cond. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1481 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8fef36c6ffd85e46485d91146eddc605fa366ee8;p=emacs.git * conf_post.h (assume): Fix compiler error: x shall be cond. --- 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 + + * conf_post.h (assume): Fix compiler error: x shall be cond. + 2013-09-22 Daniel Colascione * 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