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/bidi.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/bidi.c')
| -rw-r--r-- | src/bidi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bidi.c b/src/bidi.c index bdf60001781..6dbfab37ea3 100644 --- a/src/bidi.c +++ b/src/bidi.c | |||
| @@ -566,7 +566,7 @@ bidi_copy_it (struct bidi_it *to, struct bidi_it *from) | |||
| 566 | RTL characters in the offending line of text. */ | 566 | RTL characters in the offending line of text. */ |
| 567 | /* Do we need to allow customization of this limit? */ | 567 | /* Do we need to allow customization of this limit? */ |
| 568 | #define BIDI_CACHE_MAX_ELTS_PER_SLOT 50000 | 568 | #define BIDI_CACHE_MAX_ELTS_PER_SLOT 50000 |
| 569 | verify (BIDI_CACHE_CHUNK < BIDI_CACHE_MAX_ELTS_PER_SLOT); | 569 | static_assert (BIDI_CACHE_CHUNK < BIDI_CACHE_MAX_ELTS_PER_SLOT); |
| 570 | static ptrdiff_t bidi_cache_max_elts = BIDI_CACHE_MAX_ELTS_PER_SLOT; | 570 | static ptrdiff_t bidi_cache_max_elts = BIDI_CACHE_MAX_ELTS_PER_SLOT; |
| 571 | static struct bidi_it *bidi_cache; | 571 | static struct bidi_it *bidi_cache; |
| 572 | static ptrdiff_t bidi_cache_size = 0; | 572 | static ptrdiff_t bidi_cache_size = 0; |
| @@ -2626,7 +2626,7 @@ bidi_find_bracket_pairs (struct bidi_it *bidi_it) | |||
| 2626 | ptrdiff_t pairing_pos; | 2626 | ptrdiff_t pairing_pos; |
| 2627 | int idx_at_entry = bidi_cache_idx; | 2627 | int idx_at_entry = bidi_cache_idx; |
| 2628 | 2628 | ||
| 2629 | verify (MAX_BPA_STACK >= 100); | 2629 | static_assert (MAX_BPA_STACK >= 100); |
| 2630 | bidi_copy_it (&saved_it, bidi_it); | 2630 | bidi_copy_it (&saved_it, bidi_it); |
| 2631 | /* bidi_cache_iterator_state refuses to cache on backward scans, | 2631 | /* bidi_cache_iterator_state refuses to cache on backward scans, |
| 2632 | and bidi_cache_fetch_state doesn't bring scan_dir from the | 2632 | and bidi_cache_fetch_state doesn't bring scan_dir from the |