summaryrefslogtreecommitdiff
path: root/lib/verify.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-05-30 16:09:25 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-05-30 16:13:04 -0700
commite7b01df5cf83cdb7e7ca5558a0f557cf6354dace (patch)
tree9905b9451d5988e2f96f5a80332f19e67d581b17 /lib/verify.h
parent13411853b25f3c861d9364961f8ca0b18a9b5ed4 (diff)
downloademacs-e7b01df5cf83cdb7e7ca5558a0f557cf6354dace.tar.gz
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.h2
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>
# define assume(R) ((R) ? (void) 0 : __builtin_unreachable ())
#elif 1200 <= _MSC_VER
# define assume(R) __assume (R)
-#elif (defined lint \
+#elif ((defined GCC_LINT || defined lint) \
&& (__has_builtin (__builtin_trap) \
|| 3 < __GNUC__ + (3 < __GNUC_MINOR__ + (4 <= __GNUC_PATCHLEVEL__))))
/* Doing it this way helps various packages when configured with