Imported from ../bash-2.0.tar.gz.

[platform/upstream/bash.git] / lib / termcap / tparam.c

diff --git a/lib/termcap/tparam.c b/lib/termcap/tparam.c
index 4badb65..2470289 100644 (file)
--- a/lib/termcap/tparam.c
+++ b/lib/termcap/tparam.c
@@ -1,5 +1,5 @@
 /* Merge parameters into a termcap entry string.
-   Copyright (C) 1985, 1987, 1993 Free Software Foundation, Inc.
+   Copyright (C) 1985, 87, 93, 95 Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* Emacs config.h may rename various library functions such as malloc.  */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #else /* not HAVE_CONFIG_H */
 
 #if defined(HAVE_STRING_H) || defined(STDC_HEADERS)
@@ -92,16 +92,13 @@ tparam (string, outstring, len, arg0, arg1, arg2, arg3)
      int len;
      int arg0, arg1, arg2, arg3;
 {
-#ifdef NO_ARG_ARRAY
   int arg[4];
+
   arg[0] = arg0;
   arg[1] = arg1;
   arg[2] = arg2;
   arg[3] = arg3;
   return tparam1 (string, outstring, len, NULL, NULL, arg);
-#else
-  return tparam1 (string, outstring, len, NULL, NULL, &arg0);
-#endif
 }
 
 char *BC;