Merge from emacs--devo--0

[gnu-emacs] / src / term.c

diff --git a/src/term.c b/src/term.c
index bb7c139eafd5b28be3d8c41be6005ae57ab687fc..e7d66420ffa06c5ec4c748b2ca1e567128ad6a9f 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -37,6 +37,7 @@ Boston, MA 02110-1301, USA.  */
 #endif
 
 #include <signal.h>
+#include <stdarg.h>
 
 #include "lisp.h"
 #include "termchar.h"
@@ -3866,14 +3867,14 @@ maybe_fatal (must_succeed, buffer, terminal, str1, str2, arg1, arg2)
   abort ();
 }
 
-/* VARARGS 1 */
 void
-fatal (str, arg1, arg2)
-     char *str, *arg1, *arg2;
+fatal (const char *str, ...)
 {
+  va_list ap;
+  va_start (ap, str);
   fprintf (stderr, "emacs: ");
-  fprintf (stderr, str, arg1, arg2);
-  fprintf (stderr, "\n");
+  vfprintf (stderr, str, ap);
+  va_end (ap);
   fflush (stderr);
   exit (1);
 }