Merge from emacs-23

[gnu-emacs] / src / terminfo.c

diff --git a/src/terminfo.c b/src/terminfo.c
index c1e1a36a83339398cd261aebb482cfba697ef571..50749492cfef6b46dca92d5b7919a92212657f30 100644 (file)
--- a/src/terminfo.c
+++ b/src/terminfo.c
@@ -1,6 +1,6 @@
 /* Interface from Emacs to terminfo.
    Copyright (C) 1985, 1986, 2001, 2002, 2003, 2004,
-                 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+                 2005, 2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -18,6 +18,7 @@ You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include <config.h>
+#include <setjmp.h>
 #include "lisp.h"
 
 /* Define these variables that serve as global parameters to termcap,
@@ -34,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)