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 29cd86765844d1e7233544dbfa31dbb8d09a125a..093368568c26e38345f5bf41c135c0747687ef3d 100644 (file)
--- 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 7d4e1f43ed7b31d37b8fa3a7c39077c33f696e16..3c348d0705bf15067d4c56562be64ed78dc5da91 100644 (file)
--- 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