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 /lib-src/asset-directory-tool.c | |
| parent | 19a18e487b8e2f0c1627b9cc98e601327e884eb2 (diff) | |
| download | emacs-e25655756315ac398d15b308511a8e9abf20bb0e.tar.gz emacs-e25655756315ac398d15b308511a8e9abf20bb0e.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 'lib-src/asset-directory-tool.c')
| -rw-r--r-- | lib-src/asset-directory-tool.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/asset-directory-tool.c b/lib-src/asset-directory-tool.c index 23f4655448c..a95bbd4735e 100644 --- a/lib-src/asset-directory-tool.c +++ b/lib-src/asset-directory-tool.c | |||
| @@ -20,7 +20,7 @@ along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>. */ | |||
| 20 | #include <config.h> | 20 | #include <config.h> |
| 21 | 21 | ||
| 22 | #include <stdio.h> | 22 | #include <stdio.h> |
| 23 | #include <verify.h> | 23 | #include <assert.h> |
| 24 | #include <fcntl.h> | 24 | #include <fcntl.h> |
| 25 | #include <errno.h> | 25 | #include <errno.h> |
| 26 | #include <byteswap.h> | 26 | #include <byteswap.h> |
| @@ -236,7 +236,7 @@ main_2 (int fd, struct directory_tree *tree, size_t *offset) | |||
| 236 | output[0] = (unsigned int) tree->st_size; | 236 | output[0] = (unsigned int) tree->st_size; |
| 237 | #endif /* !WORDS_BIGENDIAN */ | 237 | #endif /* !WORDS_BIGENDIAN */ |
| 238 | 238 | ||
| 239 | verify (sizeof output == 8 && sizeof output[0] == 4); | 239 | static_assert (sizeof output == 8 && sizeof output[0] == 4); |
| 240 | if (!need_file_size) | 240 | if (!need_file_size) |
| 241 | { | 241 | { |
| 242 | if (write (fd, output + 1, 4) < 1) | 242 | if (write (fd, output + 1, 4) < 1) |