From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 4 Apr 2011 19:53:59 +0000 (-0700)
Subject: * composite.h, composite.c (composition_gstring_put_cache):
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~394^2~21
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dcd5c89a9e2fbaecd3f5a55c0221636537950c46;p=emacs.git

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

Use EMACS_INT, not int, for length.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b029374f83..d7edbb610f7 100644
--- 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 af642ad9a72..1ce7bff2982 100644
--- 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 fa8e1164e4a..ffdb57a571e 100644
--- 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,