diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-22 13:07:17 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2013-09-22 13:07:17 +0200 |
| commit | 8fef36c6ffd85e46485d91146eddc605fa366ee8 (patch) | |
| tree | 3c1880c96e8dcde15610f313ce2b93f3469af43d | |
| parent | cd9356f211b24948a934ce08b60f61301d866835 (diff) | |
| download | emacs-8fef36c6ffd85e46485d91146eddc605fa366ee8.tar.gz | |
* conf_post.h (assume): Fix compiler error: x shall be cond.
| -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 |