Merge from emacs-23

[gnu-emacs] / src / terminfo.c

diff --git a/src/terminfo.c b/src/terminfo.c
index bc6cd7f852b499b779adbda130731a5180674fe3..4b80308d2337280ee60b44ec22413ab6b7730ee9 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -35,13 +35,12 @@ char *UP, *BC, PC;
 */
 
 char *
-tparam (string, outstring, len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9)
-     char *string;
-     char *outstring;
-     int len, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9;
+tparam (char *string, char *outstring,
+       int len, int arg1, int arg2, int arg3, int arg4,
+       int arg5, int arg6, int arg7, int arg8, int arg9)
 {
   char *temp;
-  extern char *tparm();
+  extern char *tparm (char *str, ...);
 
   temp = tparm (string, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
   if (outstring == 0)