aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPaul Eggert2013-09-04 15:34:04 -0700
committerPaul Eggert2013-09-04 15:34:04 -0700
commit0c90b9eed9ce554816c9ca55d3aa30d6203d1679 (patch)
tree59fb036fda984820c0afdf1c0e588686e7077a7a /src
parent9c750ebae6b133bb28ed9508fdc74585b300c155 (diff)
downloademacs-0c90b9eed9ce554816c9ca55d3aa30d6203d1679.tar.gz
emacs-0c90b9eed9ce554816c9ca55d3aa30d6203d1679.zip
* alloc.c (make_event_array): First arg is now ptrdiff_t, not int.
This fixes a type error on hosts where ptrdiff_t is wider than int.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/alloc.c4
-rw-r--r--src/lisp.h2
3 files changed, 8 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index e64d22b9a6e..d991c2dac72 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
12013-09-04 Paul Eggert <eggert@cs.ucla.edu>
2
3 * alloc.c (make_event_array): First arg is now ptrdiff_t, not int.
4 This fixes a type error on hosts where ptrdiff_t is wider than int.
5
12013-09-04 Stefan Monnier <monnier@iro.umontreal.ca> 62013-09-04 Stefan Monnier <monnier@iro.umontreal.ca>
2 7
3 * keyboard.c (read_key_sequence_vs): New function. 8 * keyboard.c (read_key_sequence_vs): New function.
diff --git a/src/alloc.c b/src/alloc.c
index 8417ef4982b..0989e63664f 100644
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3527,9 +3527,9 @@ free_marker (Lisp_Object marker)
3527 Any number of arguments, even zero arguments, are allowed. */ 3527 Any number of arguments, even zero arguments, are allowed. */
3528 3528
3529Lisp_Object 3529Lisp_Object
3530make_event_array (register int nargs, Lisp_Object *args) 3530make_event_array (ptrdiff_t nargs, Lisp_Object *args)
3531{ 3531{
3532 int i; 3532 ptrdiff_t i;
3533 3533
3534 for (i = 0; i < nargs; i++) 3534 for (i = 0; i < nargs; i++)
3535 /* The things that fit in a string 3535 /* The things that fit in a string
diff --git a/src/lisp.h b/src/lisp.h
index b19745baf91..27359ffeb3f 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3463,7 +3463,7 @@ build_unibyte_string (const char *str)
3463} 3463}
3464 3464
3465extern Lisp_Object make_multibyte_string (const char *, ptrdiff_t, ptrdiff_t); 3465extern Lisp_Object make_multibyte_string (const char *, ptrdiff_t, ptrdiff_t);
3466extern Lisp_Object make_event_array (int, Lisp_Object *); 3466extern Lisp_Object make_event_array (ptrdiff_t, Lisp_Object *);
3467extern Lisp_Object make_uninit_string (EMACS_INT); 3467extern Lisp_Object make_uninit_string (EMACS_INT);
3468extern Lisp_Object make_uninit_multibyte_string (EMACS_INT, EMACS_INT); 3468extern Lisp_Object make_uninit_multibyte_string (EMACS_INT, EMACS_INT);
3469extern Lisp_Object make_string_from_bytes (const char *, ptrdiff_t, ptrdiff_t); 3469extern Lisp_Object make_string_from_bytes (const char *, ptrdiff_t, ptrdiff_t);