aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJan Djärv2013-09-22 13:07:17 +0200
committerJan Djärv2013-09-22 13:07:17 +0200
commit8fef36c6ffd85e46485d91146eddc605fa366ee8 (patch)
tree3c1880c96e8dcde15610f313ce2b93f3469af43d /src
parentcd9356f211b24948a934ce08b60f61301d866835 (diff)
downloademacs-8fef36c6ffd85e46485d91146eddc605fa366ee8.tar.gz
emacs-8fef36c6ffd85e46485d91146eddc605fa366ee8.zip
* conf_post.h (assume): Fix compiler error: x shall be cond.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/conf_post.h2
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 @@
12013-09-22 Jan Djärv <jan.h.d@swipnet.se>
2
3 * conf_post.h (assume): Fix compiler error: x shall be cond.
4
12013-09-22 Daniel Colascione <dancol@dancol.org> 52013-09-22 Daniel Colascione <dancol@dancol.org>
2 6
3 * xfns.c (x_get_monitor_attributes): Suppress unused variable 7 * 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, ...);
253#if defined lint 253#if defined lint
254# define assume(cond) ((cond) ? (void) 0 : abort ()) 254# define assume(cond) ((cond) ? (void) 0 : abort ())
255#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4 255#elif (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4
256# define assume(cond) ((x) || (__builtin_unreachable(), 0)) 256# define assume(cond) ((cond) || (__builtin_unreachable(), 0))
257#elif defined __MSC_VER 257#elif defined __MSC_VER
258# define assume(cond) __assume ((cond)) 258# define assume(cond) __assume ((cond))
259#else 259#else