diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-22 14:52:59 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-22 14:54:09 -0700 |
| commit | 0041ce81897ef837d04674b634720645379f3b18 (patch) | |
| tree | 18bf7518610a73e3fcdfceff16f10f5481454df3 /m4 | |
| parent | 0b6d8053eaeff2eb58472d28057425c63d24e880 (diff) | |
| download | emacs-0041ce81897ef837d04674b634720645379f3b18.tar.gz | |
Update from gnulib
This incorporates:
2016-09-22 stdint: port to GCC 7
2016-09-22 limits-h, stdint: don't assume extensions
* doc/misc/texinfo.tex, m4/limits-h.m4, m4/stdint.m4: Copy from gnulib.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/limits-h.m4 | 4 | ||||
| -rw-r--r-- | m4/stdint.m4 | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/m4/limits-h.m4 b/m4/limits-h.m4 index 913078689ba..31fdf0a779e 100644 --- a/m4/limits-h.m4 +++ b/m4/limits-h.m4 @@ -14,7 +14,9 @@ AC_DEFUN_ONCE([gl_LIMITS_H], AC_CACHE_CHECK([whether limits.h has ULLONG_WIDTH etc.], [gl_cv_header_limits_width], [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[#define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + [AC_LANG_PROGRAM([[#ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif #include <limits.h> int ullw = ULLONG_WIDTH;]])], [gl_cv_header_limits_width=yes], diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 52f7814ef84..fa6f103a63b 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 45 +# stdint.m4 serial 47 dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -321,6 +321,9 @@ int32_t i32 = INT32_C (0x7fffffff); [AC_LANG_PROGRAM([[ /* Work if build is not clean. */ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 + #ifndef __STDC_WANT_IEC_60559_BFP_EXT__ + #define __STDC_WANT_IEC_60559_BFP_EXT__ 1 + #endif #include <stdint.h> ]gl_STDINT_INCLUDES[ int iw = UINTMAX_WIDTH; @@ -343,7 +346,8 @@ int32_t i32 = INT32_C (0x7fffffff); fi # The substitute stdint.h needs the substitute limit.h's _GL_INTEGER_WIDTH. - test -z "$STDINT_H" || LIMITS_H=limits.h + LIMITS_H=limits.h + AM_CONDITIONAL([GL_GENERATE_LIMITS_H], [test -n "$LIMITS_H"]) AC_SUBST([HAVE_C99_STDINT_H]) AC_SUBST([HAVE_SYS_BITYPES_H]) |