From: Eli Zaretskii <eliz@gnu.org>
Date: Mon, 23 Sep 2013 08:25:48 +0000 (+0300)
Subject: Fix the definition of 'assume' for GCC older than 4.5.
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1471
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cd548fa41b9d298bea8e09b57655e20887d2e922;p=emacs.git

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.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 29cd8676584..093368568c2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-23  Eli Zaretskii  <eliz@gnu.org>
+
+	* conf_post.h (__has_builtin): Define to zero, if undefined, on
+	all platforms, not just for clang.
+
 2013-09-23  Jan Djärv  <jan.h.d@swipnet.se>
 
 	* 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, ...);
 # define FLEXIBLE_ARRAY_MEMBER 1
 #endif
 
-#ifdef __clang__
-# ifndef __has_builtin
-#  define __has_builtin(x) 0
-# endif
+#ifndef __has_builtin
+# define __has_builtin(x) 0
 #endif
 
 /* assume(cond) tells the compiler (and lint) that a certain condition