Merge from gnulib.

* src/conf_post.h (__has_builtin, assume): Remove; gnulib now does these.
* src/lisp.h: Include <verify.h>, for 'assume'.

This also incorpoprates:
2013-10-02 verify: new macro 'assume'
2013-09-26 dup2, dup3: work around another cygwin crasher
2013-09-26 getdtablesize: work around cygwin issue

3 files changed, 7 insertions, 19 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 8a0d8863548..8713d493dca 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2013-10-03  Paul Eggert  <eggert@cs.ucla.edu>
 
+        Adjust to merge from gnulib.
+        * conf_post.h (__has_builtin, assume): Remove; gnulib now does these.
+        * lisp.h: Include <verify.h>, for 'assume'.
+
         * eval.c (clobbered_eassert): New macro.
         (internal_catch, internal_condition_case)
         (internal_condition_case_1, internal_condition_case_2)
diff --git a/src/conf_post.h b/src/conf_post.h
index 0786bdfeb33..786105864f2 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -248,23 +248,6 @@ extern void _DebPrint (const char *fmt, ...);
 # define FLEXIBLE_ARRAY_MEMBER 1
 #endif
 
-#ifndef __has_builtin
-# define __has_builtin(x) 0
-#endif
-
-/* Tell the compiler (and lint) that COND will always hold, and that
-   it should optimize (or check) accordingly.  */
-#if (__has_builtin (__builtin_unreachable) \
-     || (__GNUC__ == 4 && __GNUC_MINOR__ >= 5) || __GNUC__ > 4)
-# define assume(cond) ((cond) ? (void) 0 : __builtin_unreachable ())
-#elif defined _MSC_VER
-# define assume(cond) __assume (cond)
-#elif defined lint
-# define assume(cond) ((cond) ? (void) 0 : abort ())
-#else
-# define assume(cond) ((void) (0 && (cond)))
-#endif
-
 /* Use this to suppress gcc's `...may be used before initialized' warnings. */
 #ifdef lint
 /* Use CODE only if lint checking is in effect.  */
diff --git a/src/lisp.h b/src/lisp.h
index 688c89c1eee..ee83e227db0 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -31,6 +31,7 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 #include <limits.h>
 
 #include <intprops.h>
+#include <verify.h>
 
 INLINE_HEADER_BEGIN
 
@@ -1145,9 +1146,9 @@ struct Lisp_Vector
       /* ...but sometimes there is also a pointer internally used in
          vector allocation code.  Usually you don't want to touch this.  */
       struct Lisp_Vector *next;
-      
+
       /* We can't use FLEXIBLE_ARRAY_MEMBER here.  */
-      Lisp_Object contents[1]; 
+      Lisp_Object contents[1];
     } u;
   };