diff options
| author | Paul Eggert | 2018-08-11 19:07:43 -0700 |
|---|---|---|
| committer | Paul Eggert | 2018-08-11 19:08:29 -0700 |
| commit | d64c1be99036d083d1d0db97ed1f41b1dd1005bc (patch) | |
| tree | a509acaac4b35e88057a71688838088177d65a96 /lib/verify.h | |
| parent | 1145bd0ef97630473746fb96da00951ae81c358c (diff) | |
| download | emacs-d64c1be99036d083d1d0db97ed1f41b1dd1005bc.tar.gz emacs-d64c1be99036d083d1d0db97ed1f41b1dd1005bc.zip | |
Update from Gnulib
This incorporates:
2018-08-11 verify: port 'assume' to traditional tools
* build-aux/config.sub, lib/regcomp.c, lib/verify.h:
Copy from Gnulib.
* lib/gnulib.mk.in: Regenerate.
Diffstat (limited to 'lib/verify.h')
| -rw-r--r-- | lib/verify.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/verify.h b/lib/verify.h index bc7f99dbd73..3b57ddee0ac 100644 --- a/lib/verify.h +++ b/lib/verify.h | |||
| @@ -276,7 +276,8 @@ template <int w> | |||
| 276 | when 'assume' silences warnings even with older GCCs. */ | 276 | when 'assume' silences warnings even with older GCCs. */ |
| 277 | # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) | 277 | # define assume(R) ((R) ? (void) 0 : __builtin_trap ()) |
| 278 | #else | 278 | #else |
| 279 | # define assume(R) ((void) (0 && (R))) | 279 | /* Some tools grok NOTREACHED, e.g., Oracle Studio 12.6. */ |
| 280 | # define assume(R) ((R) ? (void) 0 : /*NOTREACHED*/ (void) 0) | ||
| 280 | #endif | 281 | #endif |
| 281 | 282 | ||
| 282 | /* @assert.h omit end@ */ | 283 | /* @assert.h omit end@ */ |