* 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.

diff --git a/src/ChangeLog b/src/ChangeLog
index e64d22b9a6e37d6110c3a7c4557100120aef4f55..d991c2dac72c9888bf455ab359b07e041b644ab6 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * 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.
+
 2013-09-04  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * keyboard.c (read_key_sequence_vs): New function.

diff --git a/src/alloc.c b/src/alloc.c
index 8417ef4982b9e347a0d91b0dba1af8737fad0b40..0989e63664ff858f8e5fbf916c74b34197db90ef 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -3527,9 +3527,9 @@ free_marker (Lisp_Object marker)
    Any number of arguments, even zero arguments, are allowed.  */
 
 Lisp_Object
-make_event_array (register int nargs, Lisp_Object *args)
+make_event_array (ptrdiff_t nargs, Lisp_Object *args)
 {
-  int i;
+  ptrdiff_t i;
 
   for (i = 0; i < nargs; i++)
     /* The things that fit in a string

diff --git a/src/lisp.h b/src/lisp.h
index b19745baf91834512092da72487e7d1b9cd8de70..27359ffeb3fb009b0f13ee7d8f4e7a56b2b927ef 100644 (file)
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3463,7 +3463,7 @@ build_unibyte_string (const char *str)
 }
 
 extern Lisp_Object make_multibyte_string (const char *, ptrdiff_t, ptrdiff_t);
-extern Lisp_Object make_event_array (int, Lisp_Object *);
+extern Lisp_Object make_event_array (ptrdiff_t, Lisp_Object *);
 extern Lisp_Object make_uninit_string (EMACS_INT);
 extern Lisp_Object make_uninit_multibyte_string (EMACS_INT, EMACS_INT);
 extern Lisp_Object make_string_from_bytes (const char *, ptrdiff_t, ptrdiff_t);