diff src/fontcolor-x.c @ 5581:56144c8593a8

Mechanically change INT to FIXNUM in our sources. src/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT (where it refers to non-bignum Lisp integers) to FIXNUM in our sources. Done for the following functions, enums, and macros: Lisp_Type_Int_Even, Lisp_Type_Int_Odd, INT_GCBITS, INT_VALBITS, make_int(), INTP(), XINT(), CHECK_INT(), XREALINT(), INT_PLUS(), INT_MINUS(), EMACS_INT_MAX (to MOST_POSITIVE_FIXNUM), EMACS_INT_MIN (to MOST_NEGATIVE_FIXNUM), NUMBER_FITS_IN_AN_EMACS_INT() to NUMBER_FITS_IN_A_FIXNUM(), XFLOATINT, XCHAR_OR_INT, INT_OR_FLOAT. The EMACS_INT typedef was not changed, it does not describe non-bignum Lisp integers. Script that did the change available in http://mid.gmane.org/20067.17650.181273.12014@parhasard.net . modules/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> [...] Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers. See the src/ChangeLog entry for more details. man/ChangeLog addition: 2011-10-09 Aidan Kehoe <kehoea@parhasard.net> * internals/internals.texi (How Lisp Objects Are Represented in C): * internals/internals.texi (Integers and Characters): Mechanically change INT to FIXNUM, where the usage describes non-bignum Lisp integers.
author Aidan Kehoe <kehoea@parhasard.net>
date Sun, 09 Oct 2011 09:51:57 +0100
parents 308d34e9f07d
children 15b0715c204d
line wrap: on
line diff
--- a/src/fontcolor-x.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/fontcolor-x.c	Sun Oct 09 09:51:57 2011 +0100
@@ -179,9 +179,9 @@
 x_color_instance_rgb_components (Lisp_Color_Instance *c)
 {
   XColor color = COLOR_INSTANCE_X_COLOR (c);
-  return (list3 (make_int (color.red),
-		 make_int (color.green),
-		 make_int (color.blue)));
+  return (list3 (make_fixnum (color.red),
+		 make_fixnum (color.green),
+		 make_fixnum (color.blue)));
 }
 
 static int
@@ -862,7 +862,7 @@
 		   : Qnil);
 	}
       else
-	value = make_int (props [i].card32);
+	value = make_fixnum (props [i].card32);
       if (namestrext) XFree (namestrext);
       result = Fcons (Fcons (name, value), result);
     }
@@ -880,9 +880,9 @@
 
   patternext = LISP_STRING_TO_EXTERNAL (pattern, Qx_font_name_encoding);
 
-  if (!NILP(maxnumber) && INTP(maxnumber))
+  if (!NILP(maxnumber) && FIXNUMP(maxnumber))
     {
-      max_number = XINT(maxnumber);
+      max_number = XFIXNUM(maxnumber);
     }
 
   names = XListFonts (DEVICE_X_DISPLAY (XDEVICE (device)),