summaryrefslogtreecommitdiff
path: root/src/charset.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-07-18 23:07:07 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-07-18 23:07:07 -0700
commitd3411f89d34bd1009cae738f917abf477be09882 (patch)
tree1faf0e2f21f2ea5e19a33eb5ae1c4ae633a1f1ea /src/charset.h
parente097a6fa863b26952a476e71a786fa7b2460277b (diff)
downloademacs-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/charset.h')
-rw-r--r--src/charset.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/charset.h b/src/charset.h
index c2a52a38e7e..be02bc0feae 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -148,7 +148,7 @@ struct charset
int id;
/* Index to Vcharset_hash_table. */
- EMACS_INT hash_index;
+ ptrdiff_t hash_index;
/* Dimension of the charset: 1, 2, 3, or 4. */
int dimension;
@@ -341,7 +341,7 @@ extern int emacs_mule_charset[256];
number of the charset. Otherwise, signal an error. */
#define CHECK_CHARSET_GET_ID(x, id) \
do { \
- int idx; \
+ ptrdiff_t idx; \
\
if (! SYMBOLP (x) || (idx = CHARSET_SYMBOL_HASH_INDEX (x)) < 0) \
wrong_type_argument (Qcharsetp, (x)); \