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, 11 insertions, 11 deletions

diff --git a/src/android.c b/src/android.c
index 51eb85a97e8..4a74f5b2af4 100644
--- a/src/android.c
+++ b/src/android.c
@@ -3963,10 +3963,10 @@ android_blit_copy (int src_x, int src_y, int width, int height,
 
           /* Turn both into offsets.  */
 
-          if (INT_MULTIPLY_WRAPV (temp, pixel, &offset)
-              || INT_MULTIPLY_WRAPV (i, mask_info->stride, &offset1)
-              || INT_ADD_WRAPV (offset, offset1, &offset)
-              || INT_ADD_WRAPV ((uintptr_t) mask, offset, &start))
+          if (ckd_mul (&offset, temp, pixel)
+              || ckd_mul (&offset1, i, mask_info->stride)
+              || ckd_add (&offset, offset, offset1)
+              || ckd_add (&start, (uintptr_t) mask, offset))
             return;
 
           if (height <= 0)
@@ -4271,10 +4271,10 @@ android_blit_xor (int src_x, int src_y, int width, int height,
 
           /* Turn both into offsets.  */
 
-          if (INT_MULTIPLY_WRAPV (temp, pixel, &offset)
-              || INT_MULTIPLY_WRAPV (i, mask_info->stride, &offset1)
-              || INT_ADD_WRAPV (offset, offset1, &offset)
-              || INT_ADD_WRAPV ((uintptr_t) mask, offset, &start))
+          if (ckd_mul (&offset, temp, pixel)
+              || ckd_mul (&offset1, i, mask_info->stride)
+              || ckd_add (&offset, offset, offset1)
+              || ckd_add (&start, (uintptr_t) mask, offset))
             return;
 
           mask = mask_current = (unsigned char *) start;
@@ -4899,9 +4899,9 @@ android_get_image (android_drawable handle,
 
   if (bitmap_info.format != ANDROID_BITMAP_FORMAT_A_8)
     {
-      if (INT_MULTIPLY_WRAPV ((size_t) bitmap_info.stride,
-                              (size_t) bitmap_info.height,
-                              &byte_size))
+      if (ckd_mul (&byte_size,
+                   (size_t) bitmap_info.stride,
+                   (size_t) bitmap_info.height))
         {
           ANDROID_DELETE_LOCAL_REF (bitmap);
           memory_full (0);