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, 10 insertions, 18 deletions

diff --git a/src/textconv.c b/src/textconv.c
index 2a7b0ed330d..0d35ec19c55 100644
--- a/src/textconv.c
+++ b/src/textconv.c
@@ -649,8 +649,7 @@ really_commit_text (struct frame *f, EMACS_INT position,
              start of the text that was inserted.  */
           wanted = start;
 
-          if (INT_ADD_WRAPV (wanted, position, &wanted)
-              || wanted < BEGV)
+          if (ckd_add (&wanted, wanted, position) || wanted < BEGV)
             wanted = BEGV;
 
           if (wanted > ZV)
@@ -664,8 +663,7 @@ really_commit_text (struct frame *f, EMACS_INT position,
              TEXT.  */
           wanted = PT;
 
-          if (INT_ADD_WRAPV (wanted, position - 1, &wanted)
-              || wanted > ZV)
+          if (ckd_add (&wanted, wanted, position - 1) || wanted > ZV)
             wanted = ZV;
 
           if (wanted < BEGV)
@@ -712,8 +710,7 @@ really_commit_text (struct frame *f, EMACS_INT position,
 
       if (position <= 0)
         {
-          if (INT_ADD_WRAPV (wanted, position, &wanted)
-              || wanted < BEGV)
+          if (ckd_add (&wanted, wanted, position) || wanted < BEGV)
             wanted = BEGV;
 
           if (wanted > ZV)
@@ -725,8 +722,7 @@ really_commit_text (struct frame *f, EMACS_INT position,
         {
           wanted = PT;
 
-          if (INT_ADD_WRAPV (wanted, position - 1, &wanted)
-              || wanted > ZV)
+          if (ckd_add (&wanted, wanted, position - 1) || wanted > ZV)
             wanted = ZV;
 
           if (wanted < BEGV)
@@ -870,8 +866,7 @@ really_set_composing_text (struct frame *f, ptrdiff_t position,
     {
       wanted = start;
 
-      if (INT_SUBTRACT_WRAPV (wanted, position, &wanted)
-          || wanted < BEGV)
+      if (ckd_sub (&wanted, wanted, position) || wanted < BEGV)
         wanted = BEGV;
 
       if (wanted > ZV)
@@ -885,8 +880,7 @@ really_set_composing_text (struct frame *f, ptrdiff_t position,
       /* end should be PT after the edit.  */
       eassert (end == PT);
 
-      if (INT_ADD_WRAPV (wanted, position - 1, &wanted)
-          || wanted > ZV)
+      if (ckd_add (&wanted, wanted, position - 1) || wanted > ZV)
         wanted = ZV;
 
       if (wanted < BEGV)
@@ -1256,8 +1250,7 @@ really_replace_text (struct frame *f, ptrdiff_t start, ptrdiff_t end,
 
   if (position <= 0)
     {
-      if (INT_ADD_WRAPV (wanted, position, &wanted)
-          || wanted < BEGV)
+      if (ckd_add (&wanted, wanted, position) || wanted < BEGV)
         wanted = BEGV;
 
       if (wanted > ZV)
@@ -1269,8 +1262,7 @@ really_replace_text (struct frame *f, ptrdiff_t start, ptrdiff_t end,
     {
       wanted = PT;
 
-      if (INT_ADD_WRAPV (wanted, position - 1, &wanted)
-          || wanted > ZV)
+      if (ckd_add (&wanted, wanted, position - 1) || wanted > ZV)
         wanted = ZV;
 
       if (wanted < BEGV)
@@ -2020,8 +2012,8 @@ get_surrounding_text (struct frame *f, ptrdiff_t left,
 
   /* And subtract left and right.  */
 
-  if (INT_SUBTRACT_WRAPV (start, left, &start)
-      || INT_ADD_WRAPV (end, right, &end))
+  if (ckd_sub (&start, start, left)
+      || ckd_add (&end, end, right))
     goto finish;
 
   start = max (start, BEGV);