* composite.h, composite.c (composition_gstring_put_cache):

Use EMACS_INT, not int, for length.

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b02937..d7edbb6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-04  Paul Eggert  <eggert@cs.ucla.edu>
 
+       * composite.h, composite.c (composition_gstring_put_cache):
+       Use EMACS_INT, not int, for length.
+
        * composite.h (COMPOSITION_DECODE_REFS): New macro,
        breaking out part of COMPOSITION_DECODE_RULE.
        (COMPOSITION_DECODE_RULE): Use it.

diff --git a/src/composite.c b/src/composite.c
index af642ad..1ce7bff 100644 (file)
--- a/src/composite.c
+++ b/src/composite.c
@@ -661,12 +661,12 @@ gstring_lookup_cache (Lisp_Object header)
 }
 
 Lisp_Object
-composition_gstring_put_cache (Lisp_Object gstring, int len)
+composition_gstring_put_cache (Lisp_Object gstring, EMACS_INT len)
 {
   struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table);
   unsigned hash;
   Lisp_Object header, copy;
-  int i;
+  EMACS_INT i;
 
   header = LGSTRING_HEADER (gstring);
   hash = h->hashfn (h, header);

diff --git a/src/composite.h b/src/composite.h
index fa8e116..ffdb57a 100644 (file)
--- a/src/composite.h
+++ b/src/composite.h
@@ -307,7 +307,7 @@ struct composition_it;
 struct face;
 struct font_metrics;
 
-extern Lisp_Object composition_gstring_put_cache (Lisp_Object, int);
+extern Lisp_Object composition_gstring_put_cache (Lisp_Object, EMACS_INT);
 extern Lisp_Object composition_gstring_from_id (int);
 extern int composition_gstring_p (Lisp_Object);
 extern int composition_gstring_width (Lisp_Object, EMACS_INT, EMACS_INT,