* term.c: Include stdarg.h.
(fatal): Implement using varargs. * lisp.h (fatal): Add argument types. (Restore 2005-09-30 change).
This commit is contained in:
parent
c2ca78bc31
commit
7c401d155d
3 changed files with 13 additions and 6 deletions
|
@ -1,3 +1,9 @@
|
|||
2007-11-22 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
* term.c: Include stdarg.h.
|
||||
(fatal): Implement using varargs.
|
||||
* lisp.h (fatal): Add argument types. (Restore 2005-09-30 change).
|
||||
|
||||
2007-11-21 Stefan Monnier <monnier@iro.umontreal.ca>
|
||||
|
||||
* lisp.h (struct Lisp_Buffer_Objfwd): Add a `slottype' field.
|
||||
|
|
|
@ -3261,7 +3261,7 @@ extern void syms_of_dired P_ ((void));
|
|||
|
||||
/* Defined in term.c */
|
||||
extern void syms_of_term P_ ((void));
|
||||
extern void fatal () NO_RETURN;
|
||||
extern void fatal P_ ((const char *msgid, ...)) NO_RETURN;
|
||||
|
||||
/* Defined in terminal.c */
|
||||
extern void syms_of_terminal P_ ((void));
|
||||
|
|
11
src/term.c
11
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"
|
||||
|
@ -3754,14 +3755,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);
|
||||
}
|
||||
|
|
Loading…
Add table
Reference in a new issue