Prefer C23 ckd_* to Gnulib *_WRAPV and *_OK macros

* src/alloc.c (android_make_lisp_symbol) [HAVE_ANDROID && !__clang__]:
* src/android.c (android_blit_copy, android_blit_xor)
(android_get_image):
* src/androidmenu.c (android_menu_show):
* src/androidselect.c (Fandroid_get_clipboard_data)
(android_notifications_notify_1):
* src/androidterm.c (android_decode_utf16)
(android_text_to_string):
* src/haiku_select.cc (be_display_notification):
* src/sfnt.c (sfnt_read_cmap_format_8, sfnt_read_cmap_format_12)
(sfnt_read_cmap_format_14, sfnt_read_cmap_table_1)
(sfnt_expand_compound_glyph_context, sfnt_poly_edges_exact)
(sfnt_read_meta_table, sfnt_read_ttc_header)
(sfnt_read_cvt_table, sfnt_read_fpgm_table)
(sfnt_read_prep_table, sfnt_make_interpreter)
(sfnt_interpret_simple_glyph, sfnt_interpret_compound_glyph_2)
(sfnt_interpret_compound_glyph, sfnt_read_default_uvs_table)
(sfnt_read_nondefault_uvs_table, sfnt_create_uvs_context)
(sfnt_read_fvar_table, sfnt_read_gvar_table)
(sfnt_read_avar_table, sfnt_read_cvar_table):
* src/sfntfont-android.c (GET_SCANLINE_BUFFER):
* src/textconv.c (really_commit_text, really_set_composing_text)
(really_replace_text, get_surrounding_text):
Prefer C2x stdckdint.h macros to intprops.h macros.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/androidselect.c b/src/androidselect.c
index 3ba3058aeb9..5b23c559d2c 100644
--- a/src/androidselect.c
+++ b/src/androidselect.c
@@ -446,7 +446,7 @@ does not have any corresponding data.  In that case, use
     {
       rc = emacs_read_quit (fd, start, BUFSIZ);
 
-      if (!INT_ADD_OK (rc, length, &length)
+      if (ckd_add (&length, length, rc)
           || PTRDIFF_MAX - length < BUFSIZ)
         memory_full (PTRDIFF_MAX);
 
@@ -588,7 +588,7 @@ android_notifications_notify_1 (Lisp_Object title, Lisp_Object body,
   if (NILP (replaces_id))
     {
       /* Generate a new identifier.  */
-      INT_ADD_WRAPV (counter, 1, &counter);
+      ckd_add (&counter, counter, 1);
       id = counter;
     }
   else