diff options
| author | Paul Eggert | 2016-05-30 16:09:25 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-05-30 16:13:04 -0700 |
| commit | e7b01df5cf83cdb7e7ca5558a0f557cf6354dace (patch) | |
| tree | 9905b9451d5988e2f96f5a80332f19e67d581b17 /lib/verify.h | |
| parent | 13411853b25f3c861d9364961f8ca0b18a9b5ed4 (diff) | |
| download | emacs-e7b01df5cf83cdb7e7ca5558a0f557cf6354dace.tar.gz emacs-e7b01df5cf83cdb7e7ca5558a0f557cf6354dace.zip | |
Update from gnulib
This incorporates:
2016-05-30 Use GCC_LINT, not lint
2016-05-29 secure_getenv: Port to many more platforms.
* doc/misc/texinfo.tex, lib/secure_getenv.c, lib/verify.h:
* m4/secure_getenv.m4: Copy from gnulib.
Diffstat (limited to 'lib/verify.h')
| -rw-r--r-- | lib/verify.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/verify.h b/lib/verify.h index 2f4383743bb..5c8381d2906 100644 --- a/lib/verify.h +++ b/lib/verify.h | |||
| @@ -263,7 +263,7 @@ template <int w> | |||
| 263 | # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) | 263 | # define assume(R) ((R) ? (void) 0 : __builtin_unreachable ()) |
| 264 | #elif 1200 <= _MSC_VER | 264 | #elif 1200 <= _MSC_VER |
| 265 | # define assume(R) __assume (R) | 265 | # define assume(R) __assume (R) |
| 266 | #elif (defined lint \ | 266 | #elif ((defined GCC_LINT || defined lint) \ |
| 267 | && (__has_builtin (__builtin_trap) \ | 267 | && (__has_builtin (__builtin_trap) \ |
| 268 | || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) | 268 | || 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__)))) |
| 269 | /* Doing it this way helps various packages when configured with | 269 | /* Doing it this way helps various packages when configured with |