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.

--- a/src/menubar-msw.c	Sat Oct 08 12:26:09 2011 +0100
+++ b/src/menubar-msw.c	Sun Oct 09 09:51:57 2011 +0100
@@ -164,7 +164,7 @@
   do {
       id = MENU_ITEM_ID_BITS (id + 1);
   } while (GetMenuState (top_level_menu, id, MF_BYCOMMAND) != 0xFFFFFFFF);
-  return make_int (id);
+  return make_fixnum (id);
 }
 
 static HMENU
@@ -338,7 +338,7 @@
 				  pgui_item->suffix);
       Fputhash (id, pgui_item->callback, hash_tab);
 
-      item_info.wID = (UINT) XINT (id);
+      item_info.wID = (UINT) XFIXNUM (id);
       item_info.fType |= MFT_STRING;
       item_info.dwTypeData = (XELPTSTR)
 	LISP_STRING_TO_TSTR (displayable_menu_item (gui_item, bar_p, &accel));
@@ -671,7 +671,7 @@
   if (NILP (current_hash_table))
     return Qnil;
 
-  data = Fgethash (make_int (id), current_hash_table, Qunbound);
+  data = Fgethash (make_fixnum (id), current_hash_table, Qunbound);
 
   if (UNBOUNDP (data))
     {