diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 12:53:59 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-04-04 12:53:59 -0700 |
| commit | dcd5c89a9e2fbaecd3f5a55c0221636537950c46 (patch) | |
| tree | 090c122095d7570e2642f4552ed81c216077aaaf | |
| parent | b13a45c6f92b2489ddd16ba2af9f19ebf46d3a2a (diff) | |
| download | emacs-dcd5c89a9e2fbaecd3f5a55c0221636537950c46.tar.gz | |
* composite.h, composite.c (composition_gstring_put_cache):
Use EMACS_INT, not int, for length.
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/composite.c | 4 | ||||
| -rw-r--r-- | src/composite.h | 2 |
3 files changed, 6 insertions, 3 deletions
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, |