diff options
| author | Paul Eggert | 2017-01-10 07:48:37 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-01-10 07:49:55 -0800 |
| commit | fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d (patch) | |
| tree | 31408852501056452a337677c8f5b80fd3c24e7c /lib/intprops.h | |
| parent | 560a384038845e37228226313eccfc8d70132553 (diff) | |
| download | emacs-fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d.tar.gz emacs-fa0a2b4e7c81f57aecc1d94df00588a4dd5c281d.zip | |
Merge from gnulib
This incorporates:
2017-01-09 maint: time stamp -> timestamp
2017-01-07 stdioext: Port to Minix 3.2 and newer
2017-01-06 glob, intprops, xalloc: work around Clang bug
2017-01-02 revert copyright-year change to synced files
* doc/misc/texinfo.tex, lib/fpending.c, lib/intprops.h, lib/mktime.c:
* lib/stat-time.h, lib/stdio-impl.h, lib/time.in.h, lib/timespec.h:
* lib/utimens.c, lib/xalloc-oversized.h:
Copy from gnulib.
Diffstat (limited to 'lib/intprops.h')
| -rw-r--r-- | lib/intprops.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/lib/intprops.h b/lib/intprops.h index e0c178fea8e..85ed61f8d8c 100644 --- a/lib/intprops.h +++ b/lib/intprops.h | |||
| @@ -23,10 +23,6 @@ | |||
| 23 | #include <limits.h> | 23 | #include <limits.h> |
| 24 | #include <verify.h> | 24 | #include <verify.h> |
| 25 | 25 | ||
| 26 | #ifndef __has_builtin | ||
| 27 | # define __has_builtin(x) 0 | ||
| 28 | #endif | ||
| 29 | |||
| 30 | /* Return a value with the common real type of E and V and the value of V. */ | 26 | /* Return a value with the common real type of E and V and the value of V. */ |
| 31 | #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) | 27 | #define _GL_INT_CONVERT(e, v) (0 * (e) + (v)) |
| 32 | 28 | ||
| @@ -241,12 +237,10 @@ verify (TYPE_WIDTH (unsigned int) == UINT_WIDTH); | |||
| 241 | : (max) >> (b) < (a)) | 237 | : (max) >> (b) < (a)) |
| 242 | 238 | ||
| 243 | /* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ | 239 | /* True if __builtin_add_overflow (A, B, P) works when P is non-null. */ |
| 244 | #define _GL_HAS_BUILTIN_OVERFLOW \ | 240 | #define _GL_HAS_BUILTIN_OVERFLOW (5 <= __GNUC__) |
| 245 | (5 <= __GNUC__ || __has_builtin (__builtin_add_overflow)) | ||
| 246 | 241 | ||
| 247 | /* True if __builtin_add_overflow_p (A, B, C) works. */ | 242 | /* True if __builtin_add_overflow_p (A, B, C) works. */ |
| 248 | #define _GL_HAS_BUILTIN_OVERFLOW_P \ | 243 | #define _GL_HAS_BUILTIN_OVERFLOW_P (7 <= __GNUC__) |
| 249 | (7 <= __GNUC__ || __has_builtin (__builtin_add_overflow_p)) | ||
| 250 | 244 | ||
| 251 | /* The _GL*_OVERFLOW macros have the same restrictions as the | 245 | /* The _GL*_OVERFLOW macros have the same restrictions as the |
| 252 | *_RANGE_OVERFLOW macros, except that they do not assume that operands | 246 | *_RANGE_OVERFLOW macros, except that they do not assume that operands |