aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-09-23 11:25:48 +0300
committerEli Zaretskii2013-09-23 11:25:48 +0300
commitcd548fa41b9d298bea8e09b57655e20887d2e922 (patch)
treeee9f51a8f779b4fa2d25966e9c602439706d376b
parent8762e52438d46d81e518179e4f9bd8a939463ddb (diff)
downloademacs-cd548fa41b9d298bea8e09b57655e20887d2e922.tar.gz
emacs-cd548fa41b9d298bea8e09b57655e20887d2e922.zip
Fix the definition of 'assume' for GCC older than 4.5.
src/conf_post.h (__has_builtin): Define to zero, if undefined, on all platforms, not just for clang.
-rw-r--r--src/ChangeLog5
-rw-r--r--src/conf_post.h6
2 files changed, 7 insertions, 4 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 29cd8676584..093368568c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-09-23 Eli Zaretskii <eliz@gnu.org>
2
3 * conf_post.h (__has_builtin): Define to zero, if undefined, on
4 all platforms, not just for clang.
5
12013-09-23 Jan Djärv <jan.h.d@swipnet.se> 62013-09-23 Jan Djärv <jan.h.d@swipnet.se>
2 7
3 * filelock.c (lock_file_1): Rearrange to remove compiler warning 8 * filelock.c (lock_file_1): Rearrange to remove compiler warning
diff --git a/src/conf_post.h b/src/conf_post.h
index 7d4e1f43ed7..3c348d0705b 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -248,10 +248,8 @@ extern void _DebPrint (const char *fmt, ...);
248# define FLEXIBLE_ARRAY_MEMBER 1 248# define FLEXIBLE_ARRAY_MEMBER 1
249#endif 249#endif
250 250
251#ifdef __clang__ 251#ifndef __has_builtin
252# ifndef __has_builtin 252# define __has_builtin(x) 0
253# define __has_builtin(x) 0
254# endif
255#endif 253#endif
256 254
257/* assume(cond) tells the compiler (and lint) that a certain condition 255/* assume(cond) tells the compiler (and lint) that a certain condition