Mercurial > hg > xemacs-beta
diff src/select-msw.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 |
line wrap: on
line diff
--- a/src/select-msw.c Sat Oct 08 12:26:09 2011 +0100 +++ b/src/select-msw.c Sun Oct 09 09:51:57 2011 +0100 @@ -78,7 +78,7 @@ static int x_sym_p (Lisp_Object value) { - if (NILP (value) || INTP (value)) + if (NILP (value) || FIXNUMP (value)) return 0; /* Check for some of the X symbols */ @@ -101,7 +101,7 @@ if (NILP (value)) return 0; /* If it's an integer, assume it's a format ID */ - if (INTP (value)) return (UINT) (XINT (value)); + if (FIXNUMP (value)) return (UINT) (XFIXNUM (value)); /* If it's a string, register the format(!) */ if (STRINGP (value)) @@ -171,7 +171,7 @@ case CF_DSPBITMAP: return QCF_DSPBITMAP; case CF_DSPMETAFILEPICT: return QCF_DSPMETAFILEPICT; case CF_DSPENHMETAFILE: return QCF_DSPENHMETAFILE; - default: return make_int ((int) format); + default: return make_fixnum ((int) format); } } @@ -362,7 +362,7 @@ if (!cf_is_autofreed (cfType)) { Lisp_Object alist_elt = Qnil, rest; - Lisp_Object cfType_int = make_int (cfType); + Lisp_Object cfType_int = make_fixnum (cfType); /* First check if there's an element in the alist for this type already. */ @@ -440,7 +440,7 @@ format = qxeRegisterClipboardFormat (nameext); if (format) - return make_int ((int) format); + return make_fixnum ((int) format); else return Qnil; } @@ -453,8 +453,8 @@ int numchars; /* If it's an integer, convert to a symbol if appropriate */ - if (INTP (type_id)) - type_id = ms_cf_to_symbol (XINT (type_id)); + if (FIXNUMP (type_id)) + type_id = ms_cf_to_symbol (XFIXNUM (type_id)); /* If this is a symbol, return it */ if (SYMBOLP (type_id))