summaryrefslogtreecommitdiff
path: root/src/keymap.h
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2011-07-28 17:32:09 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2011-07-28 17:32:09 -0700
commitdbe2216bb632ae0bec0cb2c1b0e38454b9d3a753 (patch)
tree87ef36d80ddd8b88ce4ffd1b0aeb75dd677acf48 /src/keymap.h
parent34db673b3978bd88aea081882a70bdcdf53028a7 (diff)
* keymap.c: Integer overflow fixes.
(cmm_size, current_minor_maps): Use ptrdiff_t, not int, to count maps. (current_minor_maps): Check for size calculation overflow. * keymap.h: Change prototypes to match the above.
Diffstat (limited to 'src/keymap.h')
-rw-r--r--src/keymap.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/keymap.h b/src/keymap.h
index 2c826b64e1..ec9d4cadbb 100644
--- a/src/keymap.h
+++ b/src/keymap.h
@@ -38,7 +38,7 @@ extern Lisp_Object get_keymap (Lisp_Object, int, int);
EXFUN (Fset_keymap_parent, 2);
extern int describe_map_tree (Lisp_Object, int, Lisp_Object, Lisp_Object,
const char *, int, int, int, int);
-extern int current_minor_maps (Lisp_Object **, Lisp_Object **);
+extern ptrdiff_t current_minor_maps (Lisp_Object **, Lisp_Object **);
extern void initial_define_key (Lisp_Object, int, const char *);
extern void initial_define_lispy_key (Lisp_Object, const char *, const char *);
extern void syms_of_keymap (void);