diff options
| author | Paul Eggert | 2017-02-02 07:49:55 -0800 |
|---|---|---|
| committer | Paul Eggert | 2017-02-02 07:50:22 -0800 |
| commit | 46aa9a30095241cabef463fd01f71ce9ee50c4dc (patch) | |
| tree | 7c28ccb5f765954c760bdb750fd7b5978ef7114f /lib/verify.h | |
| parent | a362b56b51f49963dbb63cd318967bca9b9fef74 (diff) | |
| download | emacs-46aa9a30095241cabef463fd01f71ce9ee50c4dc.tar.gz emacs-46aa9a30095241cabef463fd01f71ce9ee50c4dc.zip | |
Merge from gnulib
2017-01-30 Port to PGI 16.10 x86-64
2017-01-20 time_rz: fix comment typo
2017-01-14 strftime: %z is -00 if unknown
This incorporates:
* doc/misc/texinfo.tex, lib/c-ctype.h, lib/strftime.c:
* lib/time-internal.h, lib/verify.h:
Copy from gnulib.
Diffstat (limited to 'lib/verify.h')
| -rw-r--r-- | lib/verify.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/verify.h b/lib/verify.h index dcaf7cab938..dcba9c8cb0a 100644 --- a/lib/verify.h +++ b/lib/verify.h | |||
| @@ -248,7 +248,12 @@ template <int w> | |||
| 248 | /* Verify requirement R at compile-time, as a declaration without a | 248 | /* Verify requirement R at compile-time, as a declaration without a |
| 249 | trailing ';'. */ | 249 | trailing ';'. */ |
| 250 | 250 | ||
| 251 | #define verify(R) _GL_VERIFY (R, "verify (" #R ")") | 251 | #ifdef __GNUC__ |
| 252 | # define verify(R) _GL_VERIFY (R, "verify (" #R ")") | ||
| 253 | #else | ||
| 254 | /* PGI barfs if R is long. Play it safe. */ | ||
| 255 | # define verify(R) _GL_VERIFY (R, "verify (...)") | ||
| 256 | #endif | ||
| 252 | 257 | ||
| 253 | #ifndef __has_builtin | 258 | #ifndef __has_builtin |
| 254 | # define __has_builtin(x) 0 | 259 | # define __has_builtin(x) 0 |