X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/fabc1281e9cde34ff9a19d843316d2ceca8647ad..cf5fc6dbeac10220394ab201ba3f4402e1e91faf:/src/terminal.c
diff --git a/src/terminal.c b/src/terminal.c
index d94164a4e4..2c0c60e734 100644
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -21,7 +21,6 @@ along with GNU Emacs. If not, see . */
#define TERMHOOKS_INLINE EXTERN_INLINE
#include
-#include
#include "lisp.h"
#include "frame.h"
@@ -43,7 +42,7 @@ struct terminal *initial_terminal;
static void delete_initial_terminal (struct terminal *);
/* This setter is used only in this file, so it can be private. */
-static inline void
+static void
tset_param_alist (struct terminal *t, Lisp_Object val)
{
t->param_alist = val;
@@ -294,7 +293,7 @@ delete_terminal (struct terminal *terminal)
for (tp = &terminal_list; *tp != terminal; tp = &(*tp)->next_terminal)
if (! *tp)
- abort ();
+ emacs_abort ();
*tp = terminal->next_terminal;
xfree (terminal->keyboard_coding);
@@ -411,7 +410,7 @@ possible return values. */)
case output_ns:
return Qns;
default:
- abort ();
+ emacs_abort ();
}
}
@@ -519,7 +518,7 @@ struct terminal *
init_initial_terminal (void)
{
if (initialized || terminal_list || tty_list)
- abort ();
+ emacs_abort ();
initial_terminal = create_terminal ();
initial_terminal->type = output_initial;
@@ -538,7 +537,7 @@ static void
delete_initial_terminal (struct terminal *terminal)
{
if (terminal != initial_terminal)
- abort ();
+ emacs_abort ();
delete_terminal (terminal);
initial_terminal = NULL;