* keyboard.c (read_char_help_form_unwind): Specify the type for ARG.

* character.c (c_string_width): Specify the type for LEN.

diff --git a/src/ChangeLog b/src/ChangeLog
index a932a97db73e2479d55d5b9090fa2916983d8246..01518fff2889673d17911f8ceaafc0440e321375 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-03  Dan Nicolaescu  <dann@ics.uci.edu>
+
+       * keyboard.c (read_char_help_form_unwind): Specify the type for ARG.
+
+       * character.c (c_string_width): Specify the type for LEN.
+
 2008-12-03  Kenichi Handa  <handa@m17n.org>
 
        * coding.c (decode_coding_utf_16): Initialize consumed_chars_base

diff --git a/src/character.c b/src/character.c
index 27ea100e0dd8efb24569ed8de6e299a844f61202..1f88432b964687791a58b5017cc9eab5e3e307bd 100644 (file)
--- a/src/character.c
+++ b/src/character.c
@@ -411,9 +411,7 @@ usage: (char-width CHAR)  */)
    respectively.  */
 
 int
-c_string_width (str, len, precision, nchars, nbytes)
-     const unsigned char *str;
-     int precision, *nchars, *nbytes;
+c_string_width (const unsigned char *str, int len, int precision, int *nchars, int *nbytes)
 {
   int i = 0, i_byte = 0;
   int width = 0;

diff --git a/src/keyboard.c b/src/keyboard.c
index 77d58931d14bfe0c3cec626ed859bd51c0d2334b..f04ab9cf2e9e850853ef44d6ab52231089343e1f 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -2429,7 +2429,7 @@ static void record_char ();
 
 static Lisp_Object help_form_saved_window_configs;
 static Lisp_Object
-read_char_help_form_unwind (arg)
+read_char_help_form_unwind (Lisp_Object arg)
 {
   Lisp_Object window_config = XCAR (help_form_saved_window_configs);
   help_form_saved_window_configs = XCDR (help_form_saved_window_configs);