diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-18 23:07:07 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-07-18 23:07:07 -0700 |
| commit | d3411f89d34bd1009cae738f917abf477be09882 (patch) | |
| tree | 1faf0e2f21f2ea5e19a33eb5ae1c4ae633a1f1ea /src/composite.c | |
| parent | e097a6fa863b26952a476e71a786fa7b2460277b (diff) | |
| download | emacs-d3411f89d34bd1009cae738f917abf477be09882.tar.gz | |
Use ptrdiff_t for hash table indexes.
* category.c (hash_get_category_set):
* ccl.c (ccl_driver):
* charset.h (struct charset.hash_index, CHECK_CHARSET_GET_ID):
* coding.c (coding_system_charset_list, detect_coding_system):
* coding.h (struct coding_system.id):
* composite.c (get_composition_id, gstring_lookup_cache):
* fns.c (hash_lookup, hash_put, Fgethash, Fputhash):
* image.c (xpm_get_color_table_h):
* lisp.h (hash_lookup, hash_put):
* minibuf.c (Ftest_completion):
Use ptrdiff_t for hash table indexes, not int (which is too
narrow, on 64-bit hosts) or EMACS_INT (which is too wide, on
32-bit --with-wide-int hosts).
Diffstat (limited to 'src/composite.c')
| -rw-r--r-- | src/composite.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/composite.c b/src/composite.c index d402d5ad0c4..43041f7b381 100644 --- a/src/composite.c +++ b/src/composite.c @@ -179,7 +179,7 @@ get_composition_id (EMACS_INT charpos, EMACS_INT bytepos, EMACS_INT nchars, Lisp_Object id, length, components, key, *key_contents; int glyph_len; struct Lisp_Hash_Table *hash_table = XHASH_TABLE (composition_hash_table); - EMACS_INT hash_index; + ptrdiff_t hash_index; EMACS_UINT hash_code; struct composition *cmp; EMACS_INT i; @@ -656,7 +656,7 @@ static Lisp_Object gstring_lookup_cache (Lisp_Object header) { struct Lisp_Hash_Table *h = XHASH_TABLE (gstring_hash_table); - EMACS_INT i = hash_lookup (h, header, NULL); + ptrdiff_t i = hash_lookup (h, header, NULL); return (i >= 0 ? HASH_VALUE (h, i) : Qnil); } |