diff options
| author | Stefan Kangas | 2024-07-24 00:09:49 +0200 |
|---|---|---|
| committer | Stefan Kangas | 2024-07-24 00:11:37 +0200 |
| commit | e25655756315ac398d15b308511a8e9abf20bb0e (patch) | |
| tree | 3e81a7dc0ab9abcfb9364b96f0f10559e61aef66 /src/fns.c | |
| parent | 19a18e487b8e2f0c1627b9cc98e601327e884eb2 (diff) | |
| download | emacs-scratch/static_assert.tar.gz emacs-scratch/static_assert.zip | |
Prefer static_assert to verifyscratch/static_assert
Although static_assert is C11-specific, and Emacs remains on C99, it
has been backported to older compilers by Gnulib. Gnulib has already
changed to prefer static_assert, and we can do the same.
* lib-src/asset-directory-tool.c (main_2):
* src/alloc.c (BLOCK_ALIGN, aligned_alloc, lisp_align_malloc)
(vectorlike_nbytes, allocate_pseudovector):
* src/android.c (android_globalize_reference, android_set_dashes):
* src/android.h:
* src/androidfont.c (androidfont_draw, androidfont_text_extents):
* src/androidvfs.c:
* src/bidi.c (BIDI_CACHE_MAX_ELTS_PER_SLOT)
(bidi_find_bracket_pairs):
* src/buffer.c (init_buffer_once):
* src/casefiddle.c (do_casify_multibyte_string):
* src/dispnew.c (scrolling_window, scrolling):
* src/editfns.c (styled_format):
* src/emacs-module.c (module_extract_big_integer):
* src/fileio.c (Fdo_auto_save):
* src/fns.c (next_almost_prime, hash_string):
* src/fringe.c (init_fringe):
* src/keyboard.h (kbd_buffer_store_event_hold):
* src/keymap.c:
* src/lisp.h (u, memclear, reduce_emacs_uint_to_hash_hash)
(modiff_incr):
* src/lread.c (skip_lazy_string):
* src/pdumper.c (dump_bignum, Fdump_emacs_portable)
(dump_do_dump_relocation, pdumper_load):
* src/process.c (make_process, Fmake_process)
(connect_network_socket):
* src/regex-emacs.c:
* src/sort.c (tim_sort):
* src/sysdep.c (init_random, SSIZE_MAX):
* src/thread.c:
* src/timefns.c (trillion_factor):
* src/unexelf.c:
* src/xterm.c (x_send_scroll_bar_event): Prefer static_assert to Gnulib
verify. Remove import of verify.h, except when used for other reasons.
Diffstat (limited to 'src/fns.c')
| -rw-r--r-- | src/fns.c | 4 |
1 files changed, 2 insertions, 2 deletions
| @@ -4631,7 +4631,7 @@ check_hash_table (Lisp_Object obj) | |||
| 4631 | EMACS_INT | 4631 | EMACS_INT |
| 4632 | next_almost_prime (EMACS_INT n) | 4632 | next_almost_prime (EMACS_INT n) |
| 4633 | { | 4633 | { |
| 4634 | verify (NEXT_ALMOST_PRIME_LIMIT == 11); | 4634 | static_assert (NEXT_ALMOST_PRIME_LIMIT == 11); |
| 4635 | for (n |= 1; ; n += 2) | 4635 | for (n |= 1; ; n += 2) |
| 4636 | if (n % 3 != 0 && n % 5 != 0 && n % 7 != 0) | 4636 | if (n % 3 != 0 && n % 5 != 0 && n % 7 != 0) |
| 4637 | return n; | 4637 | return n; |
| @@ -5391,7 +5391,7 @@ hash_string (char const *ptr, ptrdiff_t len) | |||
| 5391 | /* String is shorter than an EMACS_UINT. Use smaller loads. */ | 5391 | /* String is shorter than an EMACS_UINT. Use smaller loads. */ |
| 5392 | eassume (p <= end && end - p < sizeof (EMACS_UINT)); | 5392 | eassume (p <= end && end - p < sizeof (EMACS_UINT)); |
| 5393 | EMACS_UINT tail = 0; | 5393 | EMACS_UINT tail = 0; |
| 5394 | verify (sizeof tail <= 8); | 5394 | static_assert (sizeof tail <= 8); |
| 5395 | #if EMACS_INT_MAX > INT32_MAX | 5395 | #if EMACS_INT_MAX > INT32_MAX |
| 5396 | if (end - p >= 4) | 5396 | if (end - p >= 4) |
| 5397 | { | 5397 | { |