aboutsummaryrefslogtreecommitdiffstats
path: root/src/android.c
diff options
context:
space:
mode:
authorStefan Kangas2024-07-24 00:09:49 +0200
committerStefan Kangas2024-07-24 00:11:37 +0200
commite25655756315ac398d15b308511a8e9abf20bb0e (patch)
tree3e81a7dc0ab9abcfb9364b96f0f10559e61aef66 /src/android.c
parent19a18e487b8e2f0c1627b9cc98e601327e884eb2 (diff)
downloademacs-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/android.c')
-rw-r--r--src/android.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/android.c b/src/android.c
index d7a17c519a1..59962ead027 100644
--- a/src/android.c
+++ b/src/android.c
@@ -2969,7 +2969,7 @@ android_globalize_reference (jobject handle)
2969 (*android_java_env)->SetLongField (android_java_env, global, 2969 (*android_java_env)->SetLongField (android_java_env, global,
2970 handle_class.handle, 2970 handle_class.handle,
2971 (jlong) global); 2971 (jlong) global);
2972 verify (sizeof (jlong) >= sizeof (intptr_t)); 2972 static_assert (sizeof (jlong) >= sizeof (intptr_t));
2973 return (intptr_t) global; 2973 return (intptr_t) global;
2974} 2974}
2975 2975
@@ -3521,7 +3521,7 @@ android_set_dashes (struct android_gc *gc, int dash_offset,
3521 /* Copy the list of segments into both arrays. */ 3521 /* Copy the list of segments into both arrays. */
3522 for (i = 0; i < n; ++i) 3522 for (i = 0; i < n; ++i)
3523 gc->dashes[i] = dash_list[i]; 3523 gc->dashes[i] = dash_list[i];
3524 verify (sizeof (int) == sizeof (jint)); 3524 static_assert (sizeof (int) == sizeof (jint));
3525 (*android_java_env)->SetIntArrayRegion (android_java_env, 3525 (*android_java_env)->SetIntArrayRegion (android_java_env,
3526 array, 0, n, 3526 array, 0, n,
3527 (jint *) dash_list); 3527 (jint *) dash_list);