More macro renamings for bignum

* src/alloc.c, src/bidi.c, src/buffer.c, src/buffer.h, src/bytecode.c,
src/callint.c, src/callproc.c, src/casefiddle.c, src/casetab.c,
src/category.c, src/ccl.c, src/character.c, src/character.h,
src/charset.c, src/charset.h, src/chartab.c, src/cmds.c, src/coding.c,
src/composite.c, src/composite.h, src/data.c, src/dbusbind.c,
src/decompress.c, src/dired.c, src/dispextern.h, src/dispnew.c,
src/disptab.h, src/doc.c, src/dosfns.c, src/editfns.c,
src/emacs-module.c, src/emacs.c, src/eval.c, src/fileio.c,
src/floatfns.c, src/fns.c, src/font.c, src/font.h, src/fontset.c,
src/frame.c, src/frame.h, src/fringe.c, src/ftcrfont.c, src/ftfont.c,
src/gfilenotify.c, src/gnutls.c, src/gtkutil.c, src/image.c,
src/indent.c, src/insdel.c, src/intervals.c, src/json.c,
src/keyboard.c, src/keymap.c, src/kqueue.c, src/lcms.c, src/lisp.h,
src/lread.c, src/macros.c, src/marker.c, src/menu.c, src/minibuf.c,
src/msdos.c, src/print.c, src/process.c, src/profiler.c, src/search.c,
src/sound.c, src/syntax.c, src/syntax.h, src/sysdep.c, src/term.c,
src/termhooks.h, src/textprop.c, src/undo.c, src/w32.c,
src/w32console.c, src/w32fns.c, src/w32font.c, src/w32inevt.c,
src/w32proc.c, src/w32select.c, src/w32term.c, src/w32term.h,
src/w32uniscribe.c, src/window.c, src/xdisp.c, src/xfaces.c,
src/xfns.c, src/xfont.c, src/xftfont.c, src/xmenu.c, src/xml.c,
src/xrdb.c, src/xselect.c, src/xsettings.c, src/xterm.c, src/xwidget.c
Rename XINT->XFIXNUM, XFASTINT->XFIXNAT, XUINT->XUFIXNUM.

1 files changed, 91 insertions, 91 deletions

diff --git a/src/textprop.c b/src/textprop.c
index 3f636a125ab..4bd4892b730 100644
--- a/src/textprop.c
+++ b/src/textprop.c
@@ -79,7 +79,7 @@ text_read_only (Lisp_Object propval)
 static void
 modify_text_properties (Lisp_Object buffer, Lisp_Object start, Lisp_Object end)
 {
-  ptrdiff_t b = XINT (start), e = XINT (end);
+  ptrdiff_t b = XFIXNUM (start), e = XFIXNUM (end);
   struct buffer *buf = XBUFFER (buffer), *old = current_buffer;
 
   set_buffer_internal (buf);
@@ -145,7 +145,7 @@ validate_interval_range (Lisp_Object object, Lisp_Object *begin,
   if (EQ (*begin, *end) && begin != end)
     return NULL;
 
-  if (XINT (*begin) > XINT (*end))
+  if (XFIXNUM (*begin) > XFIXNUM (*end))
     {
       Lisp_Object n;
       n = *begin;
@@ -157,8 +157,8 @@ validate_interval_range (Lisp_Object object, Lisp_Object *begin,
     {
       register struct buffer *b = XBUFFER (object);
 
-      if (!(BUF_BEGV (b) <= XINT (*begin) && XINT (*begin) <= XINT (*end)
-            && XINT (*end) <= BUF_ZV (b)))
+      if (!(BUF_BEGV (b) <= XFIXNUM (*begin) && XFIXNUM (*begin) <= XFIXNUM (*end)
+            && XFIXNUM (*end) <= BUF_ZV (b)))
         args_out_of_range (*begin, *end);
       i = buffer_intervals (b);
 
@@ -166,24 +166,24 @@ validate_interval_range (Lisp_Object object, Lisp_Object *begin,
       if (BUF_BEGV (b) == BUF_ZV (b))
         return NULL;
 
-      searchpos = XINT (*begin);
+      searchpos = XFIXNUM (*begin);
     }
   else
     {
       ptrdiff_t len = SCHARS (object);
 
-      if (! (0 <= XINT (*begin) && XINT (*begin) <= XINT (*end)
-             && XINT (*end) <= len))
+      if (! (0 <= XFIXNUM (*begin) && XFIXNUM (*begin) <= XFIXNUM (*end)
+             && XFIXNUM (*end) <= len))
         args_out_of_range (*begin, *end);
-      XSETFASTINT (*begin, XFASTINT (*begin));
+      XSETFASTINT (*begin, XFIXNAT (*begin));
       if (begin != end)
-        XSETFASTINT (*end, XFASTINT (*end));
+        XSETFASTINT (*end, XFIXNAT (*end));
       i = string_intervals (object);
 
       if (len == 0)
         return NULL;
 
-      searchpos = XINT (*begin);
+      searchpos = XFIXNUM (*begin);
     }
 
   if (!i)
@@ -572,7 +572,7 @@ If POSITION is at the end of OBJECT, the value is nil.  */)
      it means it's the end of OBJECT.
      There are no properties at the very end,
      since no character follows.  */
-  if (XINT (position) == LENGTH (i) + i->position)
+  if (XFIXNUM (position) == LENGTH (i) + i->position)
     return Qnil;
 
   return i->plist;
@@ -621,14 +621,14 @@ get_char_property_and_overlay (Lisp_Object position, register Lisp_Object prop,
       Lisp_Object *overlay_vec;
       struct buffer *obuf = current_buffer;
 
-      if (XINT (position) < BUF_BEGV (XBUFFER (object))
-          || XINT (position) > BUF_ZV (XBUFFER (object)))
+      if (XFIXNUM (position) < BUF_BEGV (XBUFFER (object))
+          || XFIXNUM (position) > BUF_ZV (XBUFFER (object)))
         xsignal1 (Qargs_out_of_range, position);
 
       set_buffer_temp (XBUFFER (object));
 
       USE_SAFE_ALLOCA;
-      GET_OVERLAYS_AT (XINT (position), overlay_vec, noverlays, NULL, false);
+      GET_OVERLAYS_AT (XFIXNUM (position), overlay_vec, noverlays, NULL, false);
       noverlays = sort_overlays (overlay_vec, noverlays, w);
 
       set_buffer_temp (obuf);
@@ -715,7 +715,7 @@ before LIMIT.  LIMIT is a no-op if it is greater than (point-max).  */)
   if (! NILP (limit))
     {
       CHECK_FIXNUM_COERCE_MARKER (limit);
-      if (XINT (limit) < XINT (temp))
+      if (XFIXNUM (limit) < XFIXNUM (temp))
         temp = limit;
     }
   return Fnext_property_change (position, Qnil, temp);
@@ -741,7 +741,7 @@ before LIMIT.  LIMIT is a no-op if it is less than (point-min).  */)
   if (! NILP (limit))
     {
       CHECK_FIXNUM_COERCE_MARKER (limit);
-      if (XINT (limit) > XINT (temp))
+      if (XFIXNUM (limit) > XFIXNUM (temp))
         temp = limit;
     }
   return Fprevious_property_change (position, Qnil, temp);
@@ -805,17 +805,17 @@ last valid position in OBJECT.  */)
       else
         CHECK_FIXNUM_COERCE_MARKER (limit);
 
-      if (XFASTINT (position) >= XFASTINT (limit))
+      if (XFIXNAT (position) >= XFIXNAT (limit))
         {
           position = limit;
-          if (XFASTINT (position) > ZV)
+          if (XFIXNAT (position) > ZV)
             XSETFASTINT (position, ZV);
         }
       else
         while (true)
           {
             position = Fnext_char_property_change (position, limit);
-            if (XFASTINT (position) >= XFASTINT (limit))
+            if (XFIXNAT (position) >= XFIXNAT (limit))
               {
                 position = limit;
                 break;
@@ -887,23 +887,23 @@ first valid position in OBJECT.  */)
       else
         CHECK_FIXNUM_COERCE_MARKER (limit);
 
-      if (XFASTINT (position) <= XFASTINT (limit))
+      if (XFIXNAT (position) <= XFIXNAT (limit))
         {
           position = limit;
-          if (XFASTINT (position) < BEGV)
+          if (XFIXNAT (position) < BEGV)
             XSETFASTINT (position, BEGV);
         }
       else
         {
           Lisp_Object initial_value
-            = Fget_char_property (make_fixnum (XFASTINT (position) - 1),
+            = Fget_char_property (make_fixnum (XFIXNAT (position) - 1),
                                   prop, object);
 
           while (true)
             {
               position = Fprevious_char_property_change (position, limit);
 
-              if (XFASTINT (position) <= XFASTINT (limit))
+              if (XFIXNAT (position) <= XFIXNAT (limit))
                 {
                   position = limit;
                   break;
@@ -911,7 +911,7 @@ first valid position in OBJECT.  */)
               else
                 {
                   Lisp_Object value
-                    = Fget_char_property (make_fixnum (XFASTINT (position) - 1),
+                    = Fget_char_property (make_fixnum (XFIXNAT (position) - 1),
                                           prop, object);
 
                   if (!EQ (value, initial_value))
@@ -976,13 +976,13 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
   next = next_interval (i);
 
   while (next && intervals_equal (i, next)
-         && (NILP (limit) || next->position < XFASTINT (limit)))
+         && (NILP (limit) || next->position < XFIXNAT (limit)))
     next = next_interval (next);
 
   if (!next
       || (next->position
           >= (FIXNUMP (limit)
-              ? XFASTINT (limit)
+              ? XFIXNAT (limit)
               : (STRINGP (object)
                  ? SCHARS (object)
                  : BUF_ZV (XBUFFER (object))))))
@@ -1025,13 +1025,13 @@ past position LIMIT; return LIMIT if nothing is found before LIMIT.  */)
   next = next_interval (i);
   while (next
          && EQ (here_val, textget (next->plist, prop))
-         && (NILP (limit) || next->position < XFASTINT (limit)))
+         && (NILP (limit) || next->position < XFIXNAT (limit)))
     next = next_interval (next);
 
   if (!next
       || (next->position
           >= (FIXNUMP (limit)
-              ? XFASTINT (limit)
+              ? XFIXNAT (limit)
               : (STRINGP (object)
                  ? SCHARS (object)
                  : BUF_ZV (XBUFFER (object))))))
@@ -1069,19 +1069,19 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.  */)
     return limit;
 
   /* Start with the interval containing the char before point.  */
-  if (i->position == XFASTINT (position))
+  if (i->position == XFIXNAT (position))
     i = previous_interval (i);
 
   previous = previous_interval (i);
   while (previous && intervals_equal (previous, i)
          && (NILP (limit)
-             || (previous->position + LENGTH (previous) > XFASTINT (limit))))
+             || (previous->position + LENGTH (previous) > XFIXNAT (limit))))
     previous = previous_interval (previous);
 
   if (!previous
       || (previous->position + LENGTH (previous)
           <= (FIXNUMP (limit)
-              ? XFASTINT (limit)
+              ? XFIXNAT (limit)
               : (STRINGP (object) ? 0 : BUF_BEGV (XBUFFER (object))))))
     return limit;
   else
@@ -1117,7 +1117,7 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.  */)
   i = validate_interval_range (object, &position, &position, soft);
 
   /* Start with the interval containing the char before point.  */
-  if (i && i->position == XFASTINT (position))
+  if (i && i->position == XFIXNAT (position))
     i = previous_interval (i);
 
   if (!i)
@@ -1128,13 +1128,13 @@ back past position LIMIT; return LIMIT if nothing is found until LIMIT.  */)
   while (previous
          && EQ (here_val, textget (previous->plist, prop))
          && (NILP (limit)
-             || (previous->position + LENGTH (previous) > XFASTINT (limit))))
+             || (previous->position + LENGTH (previous) > XFIXNAT (limit))))
     previous = previous_interval (previous);
 
   if (!previous
       || (previous->position + LENGTH (previous)
           <= (FIXNUMP (limit)
-              ? XFASTINT (limit)
+              ? XFIXNAT (limit)
               : (STRINGP (object) ? 0 : BUF_BEGV (XBUFFER (object))))))
     return limit;
   else
@@ -1164,8 +1164,8 @@ add_text_properties_1 (Lisp_Object start, Lisp_Object end,
   if (!i)
     return Qnil;
 
-  s = XINT (start);
-  len = XINT (end) - s;
+  s = XFIXNUM (start);
+  len = XFIXNUM (end) - s;
 
   /* If this interval already has the properties, we can skip it.  */
   if (interval_has_all_properties (properties, i))
@@ -1221,8 +1221,8 @@ add_text_properties_1 (Lisp_Object start, Lisp_Object end,
           if (interval_has_all_properties (properties, i))
             {
               if (BUFFERP (object))
-                signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                     XINT (end) - XINT (start));
+                signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start));
 
               eassert (modified);
               return Qt;
@@ -1232,8 +1232,8 @@ add_text_properties_1 (Lisp_Object start, Lisp_Object end,
             {
               add_properties (properties, i, object, set_type);
               if (BUFFERP (object))
-                signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                     XINT (end) - XINT (start));
+                signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start));
               return Qt;
             }
 
@@ -1243,8 +1243,8 @@ add_text_properties_1 (Lisp_Object start, Lisp_Object end,
           copy_properties (unchanged, i);
           add_properties (properties, i, object, set_type);
           if (BUFFERP (object))
-            signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                 XINT (end) - XINT (start));
+            signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                 XFIXNUM (end) - XFIXNUM (start));
           return Qt;
         }
 
@@ -1362,8 +1362,8 @@ set_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object properties,
   /* If we want no properties for a whole string,
      get rid of its intervals.  */
   if (NILP (properties) && STRINGP (object)
-      && XFASTINT (start) == 0
-      && XFASTINT (end) == SCHARS (object))
+      && XFIXNAT (start) == 0
+      && XFIXNAT (end) == SCHARS (object))
     {
       if (!string_intervals (object))
         return Qnil;
@@ -1397,8 +1397,8 @@ set_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object properties,
   set_text_properties_1 (start, end, properties, object, i);
 
   if (BUFFERP (object) && !NILP (coherent_change_p))
-    signal_after_change (XINT (start), XINT (end) - XINT (start),
-                         XINT (end) - XINT (start));
+    signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                         XFIXNUM (end) - XFIXNUM (start));
   return Qt;
 }
 
@@ -1415,15 +1415,15 @@ set_text_properties_1 (Lisp_Object start, Lisp_Object end, Lisp_Object propertie
   register ptrdiff_t s, len;
   INTERVAL unchanged;
 
-  if (XINT (start) < XINT (end))
+  if (XFIXNUM (start) < XFIXNUM (end))
     {
-      s = XINT (start);
-      len = XINT (end) - s;
+      s = XFIXNUM (start);
+      len = XFIXNUM (end) - s;
     }
-  else if (XINT (end) < XINT (start))
+  else if (XFIXNUM (end) < XFIXNUM (start))
     {
-      s = XINT (end);
-      len = XINT (start) - s;
+      s = XFIXNUM (end);
+      len = XFIXNUM (start) - s;
     }
   else
     return;
@@ -1515,8 +1515,8 @@ Use `set-text-properties' if you want to remove all text properties.  */)
   if (!i)
     return Qnil;
 
-  s = XINT (start);
-  len = XINT (end) - s;
+  s = XFIXNUM (start);
+  len = XFIXNUM (end) - s;
 
   /* If there are no properties on this entire interval, return.  */
   if (! interval_has_some_properties (properties, i))
@@ -1573,8 +1573,8 @@ Use `set-text-properties' if you want to remove all text properties.  */)
             {
               eassert (modified);
               if (BUFFERP (object))
-                signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                     XINT (end) - XINT (start));
+                signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start));
               return Qt;
             }
 
@@ -1582,8 +1582,8 @@ Use `set-text-properties' if you want to remove all text properties.  */)
             {
               remove_properties (properties, Qnil, i, object);
               if (BUFFERP (object))
-                signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                     XINT (end) - XINT (start));
+                signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start));
               return Qt;
             }
 
@@ -1593,8 +1593,8 @@ Use `set-text-properties' if you want to remove all text properties.  */)
           copy_properties (unchanged, i);
           remove_properties (properties, Qnil, i, object);
           if (BUFFERP (object))
-            signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                 XINT (end) - XINT (start));
+            signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                 XFIXNUM (end) - XFIXNUM (start));
           return Qt;
         }
 
@@ -1627,8 +1627,8 @@ Return t if any property was actually removed, nil otherwise.  */)
   if (!i)
     return Qnil;
 
-  s = XINT (start);
-  len = XINT (end) - s;
+  s = XFIXNUM (start);
+  len = XFIXNUM (end) - s;
 
   /* If there are no properties on the interval, return.  */
   if (! interval_has_some_properties_list (properties, i))
@@ -1671,9 +1671,9 @@ Return t if any property was actually removed, nil otherwise.  */)
               if (modified)
                 {
                   if (BUFFERP (object))
-                    signal_after_change (XINT (start),
-                                         XINT (end) - XINT (start),
-                                         XINT (end) - XINT (start));
+                    signal_after_change (XFIXNUM (start),
+                                         XFIXNUM (end) - XFIXNUM (start),
+                                         XFIXNUM (end) - XFIXNUM (start));
                   return Qt;
                 }
               else
@@ -1685,8 +1685,8 @@ Return t if any property was actually removed, nil otherwise.  */)
                 modify_text_properties (object, start, end);
               remove_properties (Qnil, properties, i, object);
               if (BUFFERP (object))
-                signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                     XINT (end) - XINT (start));
+                signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start));
               return Qt;
             }
           else
@@ -1698,8 +1698,8 @@ Return t if any property was actually removed, nil otherwise.  */)
                 modify_text_properties (object, start, end);
               remove_properties (Qnil, properties, i, object);
               if (BUFFERP (object))
-                signal_after_change (XINT (start), XINT (end) - XINT (start),
-                                     XINT (end) - XINT (start));
+                signal_after_change (XFIXNUM (start), XFIXNUM (end) - XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start));
               return Qt;
             }
         }
@@ -1717,9 +1717,9 @@ Return t if any property was actually removed, nil otherwise.  */)
           if (modified)
             {
               if (BUFFERP (object))
-                signal_after_change (XINT (start),
-                                     XINT (end) - XINT (start),
-                                     XINT (end) - XINT (start));
+                signal_after_change (XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start),
+                                     XFIXNUM (end) - XFIXNUM (start));
               return Qt;
             }
           else
@@ -1746,7 +1746,7 @@ markers).  If OBJECT is a string, START and END are 0-based indices into it.  */
   i = validate_interval_range (object, &start, &end, soft);
   if (!i)
     return (!NILP (value) || EQ (start, end) ? Qnil : start);
-  e = XINT (end);
+  e = XFIXNUM (end);
 
   while (i)
     {
@@ -1755,8 +1755,8 @@ markers).  If OBJECT is a string, START and END are 0-based indices into it.  */
       if (EQ (textget (i->plist, property), value))
         {
           pos = i->position;
-          if (pos < XINT (start))
-            pos = XINT (start);
+          if (pos < XFIXNUM (start))
+            pos = XFIXNUM (start);
           return make_fixnum (pos);
         }
       i = next_interval (i);
@@ -1782,8 +1782,8 @@ markers).  If OBJECT is a string, START and END are 0-based indices into it.  */
   i = validate_interval_range (object, &start, &end, soft);
   if (!i)
     return (NILP (value) || EQ (start, end)) ? Qnil : start;
-  s = XINT (start);
-  e = XINT (end);
+  s = XFIXNUM (start);
+  e = XFIXNUM (end);
 
   while (i)
     {
@@ -1811,7 +1811,7 @@ int
 text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer)
 {
   bool ignore_previous_character;
-  Lisp_Object prev_pos = make_fixnum (XINT (pos) - 1);
+  Lisp_Object prev_pos = make_fixnum (XFIXNUM (pos) - 1);
   Lisp_Object front_sticky;
   bool is_rear_sticky = true, is_front_sticky = false; /* defaults */
   Lisp_Object defalt = Fassq (prop, Vtext_property_default_nonsticky);
@@ -1819,7 +1819,7 @@ text_property_stickiness (Lisp_Object prop, Lisp_Object pos, Lisp_Object buffer)
   if (NILP (buffer))
     XSETBUFFER (buffer, current_buffer);
 
-  ignore_previous_character = XINT (pos) <= BUF_BEGV (XBUFFER (buffer));
+  ignore_previous_character = XFIXNUM (pos) <= BUF_BEGV (XBUFFER (buffer));
 
   if (ignore_previous_character || (CONSP (defalt) && !NILP (XCDR (defalt))))
     is_rear_sticky = false;
@@ -1895,7 +1895,7 @@ copy_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object src,
   {
     Lisp_Object dest_start, dest_end;
 
-    e = XINT (pos) + (XINT (end) - XINT (start));
+    e = XFIXNUM (pos) + (XFIXNUM (end) - XFIXNUM (start));
     if (MOST_POSITIVE_FIXNUM < e)
       args_out_of_range (pos, end);
     dest_start = pos;
@@ -1905,9 +1905,9 @@ copy_text_properties (Lisp_Object start, Lisp_Object end, Lisp_Object src,
     validate_interval_range (dest, &dest_start, &dest_end, soft);
   }
 
-  s = XINT (start);
-  e = XINT (end);
-  p = XINT (pos);
+  s = XFIXNUM (start);
+  e = XFIXNUM (end);
+  p = XFIXNUM (pos);
 
   stuff = Qnil;
 
@@ -1975,8 +1975,8 @@ text_property_list (Lisp_Object object, Lisp_Object start, Lisp_Object end, Lisp
   i = validate_interval_range (object, &start, &end, soft);
   if (i)
     {
-      ptrdiff_t s = XINT (start);
-      ptrdiff_t e = XINT (end);
+      ptrdiff_t s = XFIXNUM (start);
+      ptrdiff_t e = XFIXNUM (end);
 
       while (s < e)
         {
@@ -2027,8 +2027,8 @@ add_text_properties_from_list (Lisp_Object object, Lisp_Object list, Lisp_Object
       Lisp_Object item, start, end, plist;
 
       item = XCAR (list);
-      start = make_fixnum (XINT (XCAR (item)) + XINT (delta));
-      end = make_fixnum (XINT (XCAR (XCDR (item))) + XINT (delta));
+      start = make_fixnum (XFIXNUM (XCAR (item)) + XFIXNUM (delta));
+      end = make_fixnum (XFIXNUM (XCAR (XCDR (item))) + XFIXNUM (delta));
       plist = XCAR (XCDR (XCDR (item)));
 
       Fadd_text_properties (start, end, plist, object);
@@ -2046,7 +2046,7 @@ Lisp_Object
 extend_property_ranges (Lisp_Object list, Lisp_Object old_end, Lisp_Object new_end)
 {
   Lisp_Object prev = Qnil, head = list;
-  ptrdiff_t max = XINT (new_end);
+  ptrdiff_t max = XFIXNUM (new_end);
 
   for (; CONSP (list); prev = list, list = XCDR (list))
     {
@@ -2055,9 +2055,9 @@ extend_property_ranges (Lisp_Object list, Lisp_Object old_end, Lisp_Object new_e
 
       item = XCAR (list);
       beg = XCAR (item);
-      end = XINT (XCAR (XCDR (item)));
+      end = XFIXNUM (XCAR (XCDR (item)));
 
-      if (XINT (beg) >= max)
+      if (XFIXNUM (beg) >= max)
         {
           /* The start-point is past the end of the new string.
              Discard this property.  */
@@ -2066,7 +2066,7 @@ extend_property_ranges (Lisp_Object list, Lisp_Object old_end, Lisp_Object new_e
           else
             XSETCDR (prev, XCDR (list));
         }
-      else if ((end == XINT (old_end) && end != max)
+      else if ((end == XFIXNUM (old_end) && end != max)
                || end > max)
         {
           /* Either the end-point is past the end of the new string,