diff options
| author | Paul Eggert | 2016-10-27 08:27:13 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-10-27 08:28:07 -0700 |
| commit | 63eebff30e91f4a29d2870d42cab859e7fef628b (patch) | |
| tree | 44fb2131272d7ace0225fe7fab9ab5dcb9dff93f /m4/stdint.m4 | |
| parent | 354c4a9885db314a4bd8a11cd6f11badef7b07f3 (diff) | |
| download | emacs-63eebff30e91f4a29d2870d42cab859e7fef628b.tar.gz emacs-63eebff30e91f4a29d2870d42cab859e7fef628b.zip | |
Update from gnulib
This incorporates:
2016-10-16 qsort_r: Fix macrology for platforms that lack the function.
2016-10-13 stdint: port SIZE_MAX to glibc s390
2016-10-11 maint: remove stray space after "." in AC_DEFINE comment.
* lib/gnulib.mk: Regenerate.
* lib/stdlib.in.h, m4/st_dm_mode.m4, m4/stdint.m4, m4/stdlib_h.m4:
* m4/utimes.m4: Copy from gnulib.
Diffstat (limited to 'm4/stdint.m4')
| -rw-r--r-- | m4/stdint.m4 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/m4/stdint.m4 b/m4/stdint.m4 index fa6f103a63b..05b6ab7846b 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | # stdint.m4 serial 47 | 1 | # stdint.m4 serial 48 |
| 2 | dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2001-2016 Free Software Foundation, Inc. |
| 3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
| 4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
| @@ -154,6 +154,15 @@ uintptr_t h = UINTPTR_MAX; | |||
| 154 | intmax_t i = INTMAX_MAX; | 154 | intmax_t i = INTMAX_MAX; |
| 155 | uintmax_t j = UINTMAX_MAX; | 155 | uintmax_t j = UINTMAX_MAX; |
| 156 | 156 | ||
| 157 | /* Check that SIZE_MAX has the correct type, if possible. */ | ||
| 158 | #if 201112 <= __STDC_VERSION__ | ||
| 159 | int k = _Generic (SIZE_MAX, size_t: 0); | ||
| 160 | #elif (2 <= __GNUC__ || defined __IBM__TYPEOF__ \ | ||
| 161 | || (0x5110 <= __SUNPRO_C && !__STDC__)) | ||
| 162 | extern size_t k; | ||
| 163 | extern __typeof__ (SIZE_MAX) k; | ||
| 164 | #endif | ||
| 165 | |||
| 157 | #include <limits.h> /* for CHAR_BIT */ | 166 | #include <limits.h> /* for CHAR_BIT */ |
| 158 | #define TYPE_MINIMUM(t) \ | 167 | #define TYPE_MINIMUM(t) \ |
| 159 | ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) | 168 | ((t) ((t) 0 < (t) -1 ? (t) 0 : ~ TYPE_MAXIMUM (t))) |