[Emacs-diffs] trunk r114428: * conf_post.h (assume): Fix compiler error: x shall be cond.

[Jan D.]

------------------------------------------------------------
revno: 114428
revision-id: address@hidden
parent: address@hidden
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Sun 2013-09-22 13:07:17 +0200
message:
  * conf_post.h (assume): Fix compiler error: x shall be cond.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/conf_post.h                conf_post.h-20120730211826-q0qbxxwh2emw52hd-1

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-09-22 09:48:21 +0000
+++ b/src/ChangeLog     2013-09-22 11:07:17 +0000
@@ -1,3 +1,7 @@
+2013-09-22  Jan Djärv  <address@hidden>
+
+       * conf_post.h (assume): Fix compiler error: x shall be cond.
+
 2013-09-22  Daniel Colascione  <address@hidden>
 
        * xfns.c (x_get_monitor_attributes): Suppress unused variable

=== modified file 'src/conf_post.h'
--- a/src/conf_post.h   2013-09-22 09:31:55 +0000
+++ b/src/conf_post.h   2013-09-22 11:07:17 +0000
@@ -253,7 +253,7 @@
 #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