summaryrefslogtreecommitdiff
path: root/src/emacs.c
diff options
context:
space:
mode:
authorDan Nicolaescu <dann@ics.uci.edu>2008-02-09 18:03:10 +0000
committerDan Nicolaescu <dann@ics.uci.edu>2008-02-09 18:03:10 +0000
commitb52118e91069a0fc002621de86d02779cba8a841 (patch)
tree4ab98d77c98127f7e190c4c24114ee0e696d9671 /src/emacs.c
parenteee59a6759cc593151d3c8a5a1ddd7d69f2dbb2e (diff)
downloademacs-b52118e91069a0fc002621de86d02779cba8a841.tar.gz
* configure.in (LIBX11_MACHINE, HAVE_XFREE386): Remove code
dealing with obsolete variables. * fakemail.c (MAIL_PROGRAM_NAME): Remove unused conditional. (main): Replace MAIL_PROGRAM_NAME with its value. * src/Makefile.in: * src/emacs.c: * src/gmalloc.c: * src/keyboard.c: * src/lisp.h: * src/m/ibm370aix.h: * src/process.c: * src/regex.c: * src/s/hpux.h: * src/sysdep.c: * src/sysselect.h: * src/systty.h: * src/unexec.c: * src/w32term.c: * src/xsmfns.c: * src/xterm.c: Remove code that deals with obsolete variables. * s/msdos.h (DONT_NEED_ENVIRON): Don't define. * ecrt0.c: Replace the DONT_NEED_ENVIRON test with MSDOS test, nothing else needs it anymore.
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 6a2479fc37a..6702b5e2846 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -423,11 +423,7 @@ memory_warning_signal (sig)
#if ! defined (DOS_NT) && ! defined (NO_ABORT)
-#ifndef ABORT_RETURN_TYPE
-#define ABORT_RETURN_TYPE void
-#endif
-
-ABORT_RETURN_TYPE
+void
abort ()
{
kill (getpid (), SIGABRT);
@@ -1087,10 +1083,6 @@ main (argc, argv
if (do_initial_setlocale)
setlocale (LC_ALL, "");
-#ifdef EXTRA_INITIALIZE
- EXTRA_INITIALIZE;
-#endif
-
inhibit_window_system = 0;
/* Handle the -t switch, which specifies filename to use as terminal. */