* callproc.c (strerror): Remove decl.

* fileio.c (strerror): Likewise.
* process.c (strerror): Likewise.
* emacs.c (strerror): Likewise.
(Vsystem_messages_locale): Renamed from Vmessages_locale.
All uses changed.
(Vprevious_system_messages_locale): Likewise, from
Vprevious_messages_locale.
(Vsystem_time_locale): Likewise, from Vtime_locale.
(Vprevious_system_time_locale): Likewise, from Vprevious_time_locale.
(ABORT_RETURN_TYPE): New macro.
(abort): Return type is now ABORT_RETURN_TYPE.
(main): Always invoke init_signals, even if POSIX_SIGNALS is not
defined.
(syms_of_emacs): messages-locale -> system-messages-locale,
previous-messages-locale -> previous-system-messages-locale,
time-locale -> system-time-locale,
previous-time-locale -> previous-system-time-locale.

* gmalloc.c (PP, __ptr_t): Assume ANSI C if STDC_HEADERS is defined.
(const): Do not define; that's config.h's job.
(<limits.h>): Include if HAVE_LIMITS_H is defined.
(CHAR_BIT): Move test for definedness outside of limits.h condition.
(<stddef.h>): Include if STDC_HEADERS is defined.
(FREE_RETURN_TYPE): New macro.
(free): Return type is now FREE_RETURN_TYPE.

* lisp.h (synchronize_system_time_locale): Renamed from
synchronize_time_locale.  All uses changed.
(synchronize_system_messages_locale): Likewise, from
synchronize_messages_locale.

* process.c (sys_siglist): Remove.

* syntax.c (scan_sexps_forward): Use abort, not assert.

* sysdep.c (my_sys_siglist): New var.
(sys_siglist): New macro.  Remove old initialized vars of same name.
(init_signals): Initialize sys_siglist.

* xfns.c (abort): Remove decl; stdlib.h now does this.

12 files changed, 236 insertions, 302 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 5ea59bf4629..e1d40b35055 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -25,7 +25,6 @@ Boston, MA 02111-1307, USA.  */
 #include <stdio.h>
 
 extern int errno;
-extern char *strerror ();
 
 /* Define SIGCHLD as an alias for SIGCLD.  */
 
@@ -560,7 +559,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
       synch_process_retcode = pid;
       if (synch_process_retcode < 0)  /* means it couldn't be exec'ed */
 	{
-	  synchronize_messages_locale ();
+	  synchronize_system_messages_locale ();
 	  synch_process_death = strerror (errno);
 	}
 
@@ -588,7 +587,7 @@ If you quit, the process is killed with SIGINT, or SIGKILL if you quit again.")
     synch_process_retcode = pid;
     if (synch_process_retcode < 0)  /* means it couldn't be exec'ed */
       {
-	synchronize_messages_locale ();
+	synchronize_system_messages_locale ();
 	synch_process_death = strerror (errno);
       }
 
diff --git a/src/coding.c b/src/coding.c
index c5dfd2102d0..8d840fc85fd 100644
--- a/src/coding.c
+++ b/src/coding.c
@@ -5868,7 +5868,7 @@ emacs_strerror (error_number)
 {
   char *str;
 
-  synchronize_messages_locale ();
+  synchronize_system_messages_locale ();
   str = strerror (error_number);
 
   if (! NILP (Vlocale_coding_system))
diff --git a/src/editfns.c b/src/editfns.c
index f6f30ee99a2..9cbebbda836 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -1295,7 +1295,7 @@ DEFUN ("format-time-string", Fformat_time_string, Sformat_time_string, 1, 3, 0,
   if (! tm)
     error ("Specified time is not representable");
 
-  synchronize_time_locale ();
+  synchronize_system_time_locale ();
 
   while (1)
     {
diff --git a/src/emacs.c b/src/emacs.c
index 932c3758a91..192b308bbc0 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -67,7 +67,6 @@ Boston, MA 02111-1307, USA.  */
 extern void malloc_warning ();
 extern void set_time_zone_rule ();
 extern char *index ();
-extern char *strerror ();
 
 /* Command line args from shell, as list of strings */
 Lisp_Object Vcommand_line_args;
@@ -128,10 +127,10 @@ Lisp_Object Vsystem_configuration_options;
 Lisp_Object Qfile_name_handler_alist;
 
 /* Current and previous system locales for messages and time.  */
-Lisp_Object Vmessages_locale;
-Lisp_Object Vprevious_messages_locale;
-Lisp_Object Vtime_locale;
-Lisp_Object Vprevious_time_locale;
+Lisp_Object Vsystem_messages_locale;
+Lisp_Object Vprevious_system_messages_locale;
+Lisp_Object Vsystem_time_locale;
+Lisp_Object Vprevious_system_time_locale;
 
 /* If non-zero, emacs should not attempt to use an window-specific code,
    but instead should use the virtual terminal under which it was started */
@@ -283,7 +282,12 @@ memory_warning_signal (sig)
    MSDOS has its own definition on msdos.c  */
 
 #if ! defined (DOS_NT) && ! defined (NO_ABORT)
-void
+
+#ifndef ABORT_RETURN_TYPE
+#define ABORT_RETURN_TYPE void
+#endif
+
+ABORT_RETURN_TYPE
 abort ()
 {
   kill (getpid (), SIGABRT);
@@ -881,9 +885,7 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
 #endif
     }
 
-#ifdef POSIX_SIGNALS
   init_signals ();
-#endif
 
   /* Don't catch SIGHUP if dumping.  */
   if (1
@@ -1019,8 +1021,8 @@ the Bugs section of the Emacs manual or the file BUGS.\n", argv[0]);
   if (do_initial_setlocale)
     {
       fixup_locale ();
-      Vmessages_locale = Vprevious_messages_locale;
-      Vtime_locale = Vprevious_time_locale;
+      Vsystem_messages_locale = Vprevious_system_messages_locale;
+      Vsystem_time_locale = Vprevious_system_time_locale;
     }
 
   init_eval ();
@@ -1905,10 +1907,10 @@ fixup_locale ()
 
 #ifdef LC_MESSAGES
   l = setlocale (LC_MESSAGES, (char *) 0);
-  Vprevious_messages_locale = l ? build_string (l) : Qnil;
+  Vprevious_system_messages_locale = l ? build_string (l) : Qnil;
 #endif
   l = setlocale (LC_TIME, (char *) 0);
-  Vprevious_time_locale = l ? build_string (l) : Qnil;
+  Vprevious_system_time_locale = l ? build_string (l) : Qnil;
 }
 
 static void
@@ -1923,20 +1925,22 @@ synchronize_locale (category, plocale, desired_locale)
     *plocale = desired_locale;
 }
 
-/* Set system time locale to match Vtime_locale, if possible.  */
+/* Set system time locale to match Vsystem_time_locale, if possible.  */
 void
-synchronize_time_locale ()
+synchronize_system_time_locale ()
 {
-  synchronize_locale (LC_TIME, &Vprevious_time_locale, Vtime_locale);
+  synchronize_locale (LC_TIME, &Vprevious_system_time_locale,
+		      Vsystem_time_locale);
 }
 
-/* Set system messages locale to match Vmessages_locale, if possible.  */
+/* Set system messages locale to match Vsystem_messages_locale, if
+   possible.  */
 void
-synchronize_messages_locale ()
+synchronize_system_messages_locale ()
 {
 #ifdef LC_MESSAGES
-  synchronize_locale (LC_MESSAGES, &Vprevious_messages_locale,
-		      Vmessages_locale);
+  synchronize_locale (LC_MESSAGES, &Vprevious_system_messages_locale,
+		      Vsystem_messages_locale);
 #endif
 }
 #endif /* HAVE_SETLOCALE */
@@ -2086,19 +2090,20 @@ installed locations, but we can find them\n\
 near where the Emacs executable was found.");
   Vinstallation_directory = Qnil;
 
-  DEFVAR_LISP ("messages-locale", &Vmessages_locale,
+  DEFVAR_LISP ("system-messages-locale", &Vsystem_messages_locale,
     "System locale for messages.");
-  Vmessages_locale = Qnil;
+  Vsystem_messages_locale = Qnil;
 
-  DEFVAR_LISP ("previous-messages-locale", &Vprevious_messages_locale,
+  DEFVAR_LISP ("previous-system-messages-locale",
+    &Vprevious_system_messages_locale,
     "Most recently used system locale for messages.");
-  Vprevious_messages_locale = Qnil;
+  Vprevious_system_messages_locale = Qnil;
 
-  DEFVAR_LISP ("time-locale", &Vtime_locale,
+  DEFVAR_LISP ("system-time-locale", &Vsystem_time_locale,
     "System locale for time.");
-  Vtime_locale = Qnil;
+  Vsystem_time_locale = Qnil;
 
-  DEFVAR_LISP ("previous-time-locale", &Vprevious_time_locale,
+  DEFVAR_LISP ("previous-system-time-locale", &Vprevious_system_time_locale,
     "Most recently used system locale for time.");
-  Vprevious_time_locale = Qnil;
+  Vprevious_system_time_locale = Qnil;
 }
diff --git a/src/fileio.c b/src/fileio.c
index 5a00649d79e..a91b2680ae8 100644
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -65,8 +65,6 @@ Boston, MA 02111-1307, USA.  */
 extern int errno;
 #endif
 
-extern char *strerror ();
-
 #ifdef APOLLO
 #include <sys/time.h>
 #endif
@@ -249,7 +247,7 @@ report_file_error (string, data)
   Lisp_Object errstring;
   int errorno = errno;
 
-  synchronize_messages_locale ();
+  synchronize_system_messages_locale ();
   errstring = code_convert_string_norecord (build_string (strerror (errorno)),
 					    Vlocale_coding_system, 0);
 
diff --git a/src/gmalloc.c b/src/gmalloc.c
index b291903fa50..9bf84235ee5 100644
--- a/src/gmalloc.c
+++ b/src/gmalloc.c
@@ -36,7 +36,7 @@ Cambridge, MA 02139, USA.
 #include <config.h>
 #endif
 
-#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
+#if defined __cplusplus || (defined (__STDC__) && __STDC__) || defined STDC_HEADERS
 #undef	PP
 #define	PP(args)	args
 #undef	__ptr_t
@@ -44,10 +44,6 @@ Cambridge, MA 02139, USA.
 #else /* Not C++ or ANSI C.  */
 #undef	PP
 #define	PP(args)	()
-#ifndef HAVE_CONFIG_H
-#undef	const
-#define	const
-#endif
 #undef	__ptr_t
 #define	__ptr_t		char *
 #endif /* C++ or ANSI C.  */
@@ -63,13 +59,12 @@ Cambridge, MA 02139, USA.
 #endif
 #endif
 
-#if	defined (__GNU_LIBRARY__) || (defined (__STDC__) && __STDC__)
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
-#else
+#endif
 #ifndef CHAR_BIT
 #define	CHAR_BIT	8
 #endif
-#endif
 
 #ifdef	HAVE_UNISTD_H
 #include <unistd.h>
@@ -83,7 +78,7 @@ extern "C"
 {
 #endif
 
-#if defined (__STDC__) && __STDC__
+#ifdef STDC_HEADERS
 #include <stddef.h>
 #define	__malloc_size_t		size_t
 #define	__malloc_ptrdiff_t	ptrdiff_t
@@ -96,6 +91,10 @@ extern "C"
 #define	NULL	0
 #endif
 
+#ifndef FREE_RETURN_TYPE
+#define FREE_RETURN_TYPE void
+#endif
+
 
 /* Allocate SIZE bytes of memory.  */
 extern __ptr_t malloc PP ((__malloc_size_t __size));
@@ -105,7 +104,7 @@ extern __ptr_t realloc PP ((__ptr_t __ptr, __malloc_size_t __size));
 /* Allocate NMEMB elements of SIZE bytes each, all initialized to 0.  */
 extern __ptr_t calloc PP ((__malloc_size_t __nmemb, __malloc_size_t __size));
 /* Free a block allocated by `malloc', `realloc' or `calloc'.  */
-extern void free PP ((__ptr_t __ptr));
+extern FREE_RETURN_TYPE free PP ((__ptr_t __ptr));
 
 /* Allocate SIZE bytes allocated to ALIGNMENT bytes.  */
 #if ! (defined (_MALLOC_INTERNAL) && __DJGPP__ - 0 == 1) /* Avoid conflict.  */
@@ -1128,7 +1127,8 @@ _free_internal (ptr)
 }
 
 /* Return memory to the heap.  */
-void
+
+FREE_RETURN_TYPE
 free (ptr)
      __ptr_t ptr;
 {
diff --git a/src/lisp.h b/src/lisp.h
index d48ec29461d..046f55e528e 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2588,13 +2588,13 @@ extern Lisp_Object Vinstallation_directory;
 EXFUN (Fkill_emacs, 1);
 #if HAVE_SETLOCALE
 void fixup_locale P_ ((void));
-void synchronize_messages_locale P_ ((void));
-void synchronize_time_locale P_ ((void));
+void synchronize_system_messages_locale P_ ((void));
+void synchronize_system_time_locale P_ ((void));
 #else
 #define setlocale(category, locale)
 #define fixup_locale()
-#define synchronize_messages_locale()
-#define synchronize_time_locale()
+#define synchronize_system_messages_locale()
+#define synchronize_system_time_locale()
 #endif
 void shut_down_emacs P_ ((int, int, Lisp_Object));
 /* Nonzero means don't do interactive redisplay and don't change tty modes */
diff --git a/src/process.c b/src/process.c
index 463dc44be2f..9fa3c19df2d 100644
--- a/src/process.c
+++ b/src/process.c
@@ -146,7 +146,6 @@ Lisp_Object Qlast_nonmenu_event;
 extern void set_waiting_for_input P_ ((EMACS_TIME *));
 
 extern int errno;
-extern char *strerror ();
 #ifdef VMS
 extern char *sys_errlist[];
 #endif
@@ -155,50 +154,6 @@ extern char *sys_errlist[];
 extern int h_errno;
 #endif
 
-#ifndef HAVE_STRSIGNAL
-#ifndef SYS_SIGLIST_DECLARED
-#ifndef VMS
-#ifndef BSD4_1
-#ifndef WINDOWSNT
-#ifndef LINUX
-extern char *sys_siglist[];
-#endif /* not LINUX */
-#else /* BSD4_1 */
-char *sys_siglist[] =
-  {
-    "bum signal!!",
-    "hangup",
-    "interrupt",
-    "quit",
-    "illegal instruction",
-    "trace trap",
-    "iot instruction",
-    "emt instruction",
-    "floating point exception",
-    "kill",
-    "bus error",
-    "segmentation violation",
-    "bad argument to system call",
-    "write on a pipe with no one to read it",
-    "alarm clock",
-    "software termination signal from kill",
-    "status signal",
-    "sendable stop signal not from tty",
-    "stop signal from tty",
-    "continue a stopped process",
-    "child status has changed",
-    "background read attempted from control tty",
-    "background write attempted from control tty",
-    "input record available at control tty",
-    "exceeded CPU time limit",
-    "exceeded file size limit"
-    };
-#endif /* not WINDOWSNT */
-#endif
-#endif /* VMS */
-#endif /* ! SYS_SIGLIST_DECLARED */
-#endif /* ! HAVE_STRSIGNAL */
-
 /* t means use pty, nil means use a pipe,
    maybe other values to come.  */
 static Lisp_Object Vprocess_connection_type;
@@ -360,7 +315,7 @@ status_message (status)
   if (EQ (symbol, Qsignal) || EQ (symbol, Qstop))
     {
       char *signame;
-      synchronize_messages_locale ();
+      synchronize_system_messages_locale ();
       signame = strsignal (code);
       if (signame == 0)
 	signame = "unknown";
@@ -4254,7 +4209,7 @@ sigchld_handler (signo)
 	      int code = WTERMSIG (w);
 	      char *signame;
 
-	      synchronize_messages_locale ();
+	      synchronize_system_messages_locale ();
 	      signame = strsignal (code);
 
 	      if (signame == 0)
diff --git a/src/syntax.c b/src/syntax.c
index da28d6eed6d..d08c29bab53 100644
--- a/src/syntax.c
+++ b/src/syntax.c
@@ -25,7 +25,6 @@ Boston, MA 02111-1307, USA.  */
 #include "commands.h"
 #include "buffer.h"
 #include "charset.h"
-#include <assert.h>
 
 /* Make syntax table lookup grant data in gl_state.  */
 #define SYNTAX_ENTRY_VIA_PROPERTY
@@ -2612,7 +2611,8 @@ do { prev_from = from;				\
 	  goto commentloop;
 
 	case Scomment:
-	  assert (state.incomment != 0); /* state.incomment = -1; */
+	  if (! state.incomment)
+	    abort ();
 	  if (commentstop || boundary_stop) goto done;
 	commentloop:
 	  /* The (from == BEGV) test is to enter the loop in the middle so
diff --git a/src/sysdep.c b/src/sysdep.c
index 1a3123d7ac6..bce69a406ff 100644
--- a/src/sysdep.c
+++ b/src/sysdep.c
@@ -2771,13 +2771,6 @@ sigbit (i)
 
 sigset_t empty_mask, full_mask;
 
-void
-init_signals ()
-{
-  sigemptyset (&empty_mask);
-  sigfillset (&full_mask);
-}
-
 signal_handler_t
 sys_signal (int signal_number, signal_handler_t action)
 {
@@ -2840,6 +2833,185 @@ sys_sigsetmask (sigset_t new_mask)
 
 #endif /* POSIX_SIGNALS */
 
+#if !defined HAVE_STRSIGNAL && !defined SYS_SIGLIST_DECLARED
+static char *my_sys_siglist[NSIG];
+# ifdef sys_siglist
+#  undef sys_siglist
+# endif
+# define sys_siglist my_sys_siglist
+#endif
+
+void
+init_signals ()
+{
+#ifdef POSIX_SIGNALS
+  sigemptyset (&empty_mask);
+  sigfillset (&full_mask);
+#endif
+
+#if !defined HAVE_STRSIGNAL && !defined SYS_SIGLIST_DECLARED
+  if (! initialized)
+    {
+# ifdef SIGABRT
+      sys_siglist[SIGABRT] = "Aborted";
+# endif
+# ifdef SIGAIO
+      sys_siglist[SIGAIO] = "LAN I/O interrupt";
+# endif
+# ifdef SIGALRM
+      sys_siglist[SIGALRM] = "Alarm clock";
+# endif
+# ifdef SIGBUS
+      sys_siglist[SIGBUS] = "Bus error";
+# endif
+# ifdef SIGCLD
+      sys_siglist[SIGCLD] = "Child status changed";
+# endif
+# ifdef SIGCHLD
+      sys_siglist[SIGCHLD] = "Child status changed";
+# endif
+# ifdef SIGCONT
+      sys_siglist[SIGCONT] = "Continued";
+# endif
+# ifdef SIGDANGER
+      sys_siglist[SIGDANGER] = "Swap space dangerously low";
+# endif
+# ifdef SIGDGNOTIFY
+      sys_siglist[SIGDGNOTIFY] = "Notification message in queue";
+# endif
+# ifdef SIGEMT
+      sys_siglist[SIGEMT] = "Emulation trap";
+# endif
+# ifdef SIGFPE
+      sys_siglist[SIGFPE] = "Arithmetic exception";
+# endif
+# ifdef SIGFREEZE
+      sys_siglist[SIGFREEZE] = "SIGFREEZE";
+# endif
+# ifdef SIGGRANT
+      sys_siglist[SIGGRANT] = "Monitor mode granted";
+# endif
+# ifdef SIGHUP
+      sys_siglist[SIGHUP] = "Hangup";
+# endif
+# ifdef SIGILL
+      sys_siglist[SIGILL] = "Illegal instruction";
+# endif
+# ifdef SIGINT
+      sys_siglist[SIGINT] = "Interrupt";
+# endif
+# ifdef SIGIO
+      sys_siglist[SIGIO] = "I/O possible";
+# endif
+# ifdef SIGIOINT
+      sys_siglist[SIGIOINT] = "I/O intervention required";
+# endif
+# ifdef SIGIOT
+      sys_siglist[SIGIOT] = "IOT trap";
+# endif
+# ifdef SIGKILL
+      sys_siglist[SIGKILL] = "Killed";
+# endif
+# ifdef SIGLOST
+      sys_siglist[SIGLOST] = "Resource lost";
+# endif
+# ifdef SIGLWP
+      sys_siglist[SIGLWP] = "SIGLWP";
+# endif
+# ifdef SIGMSG
+      sys_siglist[SIGMSG] = "Monitor mode data available";
+# endif
+# ifdef SIGPHONE
+      sys_siglist[SIGWIND] = "SIGPHONE";
+# endif
+# ifdef SIGPIPE
+      sys_siglist[SIGPIPE] = "Broken pipe";
+# endif
+# ifdef SIGPOLL
+      sys_siglist[SIGPOLL] = "Pollable event occurred";
+# endif
+# ifdef SIGPROF
+      sys_siglist[SIGPROF] = "Profiling timer expired";
+# endif
+# ifdef SIGPTY
+      sys_siglist[SIGPTY] = "PTY I/O interrupt";
+# endif
+# ifdef SIGPWR
+      sys_siglist[SIGPWR] = "Power-fail restart";
+# endif
+# ifdef SIGQUIT
+      sys_siglist[SIGQUIT] = "Quit";
+# endif
+# ifdef SIGRETRACT
+      sys_siglist[SIGRETRACT] = "Need to relinguish monitor mode";
+# endif
+# ifdef SIGSAK
+      sys_siglist[SIGSAK] = "Secure attention";
+# endif
+# ifdef SIGSEGV
+      sys_siglist[SIGSEGV] = "Segmentation violation";
+# endif
+# ifdef SIGSOUND
+      sys_siglist[SIGSOUND] = "Sound completed";
+# endif
+# ifdef SIGSTOP
+      sys_siglist[SIGSTOP] = "Stopped (signal)";
+# endif
+# ifdef SIGSTP
+      sys_siglist[SIGSTP] = "Stopped (user)";
+# endif
+# ifdef SIGSYS
+      sys_siglist[SIGSYS] = "Bad argument to system call";
+# endif
+# ifdef SIGTERM
+      sys_siglist[SIGTERM] = "Terminated";
+# endif
+# ifdef SIGTHAW
+      sys_siglist[SIGTHAW] = "SIGTHAW";
+# endif
+# ifdef SIGTRAP
+      sys_siglist[SIGTRAP] = "Trace/breakpoint trap";
+# endif
+# ifdef SIGTSTP
+      sys_siglist[SIGTSTP] = "Stopped (user)";
+# endif
+# ifdef SIGTTIN
+      sys_siglist[SIGTTIN] = "Stopped (tty input)";
+# endif
+# ifdef SIGTTOU
+      sys_siglist[SIGTTOU] = "Stopped (tty output)";
+# endif
+# ifdef SIGURG
+      sys_siglist[SIGURG] = "Urgent I/O condition";
+# endif
+# ifdef SIGUSR1
+      sys_siglist[SIGUSR1] = "User defined signal 1";
+# endif
+# ifdef SIGUSR2
+      sys_siglist[SIGUSR2] = "User defined signal 2";
+# endif
+# ifdef SIGVTALRM
+      sys_siglist[SIGVTALRM] = "Virtual timer expired";
+# endif
+# ifdef SIGWAITING
+      sys_siglist[SIGWAITING] = "Process's LWPs are blocked";
+# endif
+# ifdef SIGWINCH
+      sys_siglist[SIGWINCH] = "Window size changed";
+# endif
+# ifdef SIGWIND
+      sys_siglist[SIGWIND] = "SIGWIND";
+# endif
+# ifdef SIGXCPU
+      sys_siglist[SIGXCPU] = "CPU time limit exceeded";
+# endif
+# ifdef SIGXFSZ
+      sys_siglist[SIGXFSZ] = "File size limit exceeded";
+# endif
+    }
+#endif /* !defined HAVE_STRSIGNAL && !defined SYS_SIGLIST_DECLARED */
+}
+
 #ifndef HAVE_RANDOM
 #ifdef random
 #define HAVE_RANDOM
@@ -3156,95 +3328,6 @@ vfork ()
  *	always negligible.   Fred Fish, Unisoft Systems Inc.
  */
 
-#ifndef HAVE_STRSIGNAL
-#ifndef HAVE_SYS_SIGLIST
-char *sys_siglist[NSIG + 1] =
-{
-#ifdef AIX
-/* AIX has changed the signals a bit */
-  "bogus signal",			/* 0 */
-  "hangup",				/* 1  SIGHUP */
-  "interrupt",				/* 2  SIGINT */
-  "quit",				/* 3  SIGQUIT */
-  "illegal instruction",		/* 4  SIGILL */
-  "trace trap",				/* 5  SIGTRAP */
-  "IOT instruction",			/* 6  SIGIOT */
-  "crash likely",			/* 7  SIGDANGER */
-  "floating point exception",		/* 8  SIGFPE */
-  "kill",				/* 9  SIGKILL */
-  "bus error",				/* 10 SIGBUS */
-  "segmentation violation",		/* 11 SIGSEGV */
-  "bad argument to system call",	/* 12 SIGSYS */
-  "write on a pipe with no one to read it", /* 13 SIGPIPE */
-  "alarm clock",			/* 14 SIGALRM */
-  "software termination signum",	/* 15 SIGTERM */
-  "user defined signal 1",		/* 16 SIGUSR1 */
-  "user defined signal 2",		/* 17 SIGUSR2 */
-  "death of a child",			/* 18 SIGCLD */
-  "power-fail restart",			/* 19 SIGPWR */
-  "bogus signal",			/* 20 */
-  "bogus signal",			/* 21 */
-  "bogus signal",			/* 22 */
-  "bogus signal",			/* 23 */
-  "bogus signal",			/* 24 */
-  "LAN I/O interrupt",			/* 25 SIGAIO */
-  "PTY I/O interrupt",			/* 26 SIGPTY */
-  "I/O intervention required",		/* 27 SIGIOINT */
-#ifdef AIXHFT
-  "HFT grant",				/* 28 SIGGRANT */
-  "HFT retract",			/* 29 SIGRETRACT */
-  "HFT sound done",			/* 30 SIGSOUND */
-  "HFT input ready",			/* 31 SIGMSG */
-#endif
-#else /* not AIX */
-  "bogus signal",			/* 0 */
-  "hangup",				/* 1  SIGHUP */
-  "interrupt",				/* 2  SIGINT */
-  "quit",				/* 3  SIGQUIT */
-  "illegal instruction",		/* 4  SIGILL */
-  "trace trap",				/* 5  SIGTRAP */
-  "IOT instruction",			/* 6  SIGIOT */
-  "EMT instruction",			/* 7  SIGEMT */
-  "floating point exception",		/* 8  SIGFPE */
-  "kill",				/* 9  SIGKILL */
-  "bus error",				/* 10 SIGBUS */
-  "segmentation violation",		/* 11 SIGSEGV */
-  "bad argument to system call",	/* 12 SIGSYS */
-  "write on a pipe with no one to read it", /* 13 SIGPIPE */
-  "alarm clock",			/* 14 SIGALRM */
-  "software termination signum",	/* 15 SIGTERM */
-  "user defined signal 1",		/* 16 SIGUSR1 */
-  "user defined signal 2",		/* 17 SIGUSR2 */
-  "death of a child",			/* 18 SIGCLD */
-  "power-fail restart",			/* 19 SIGPWR */
-#ifdef sun
-  "window size change",			    /* 20 SIGWINCH */
-  "urgent socket condition",		    /* 21 SIGURG */
-  "pollable event occurred",		    /* 22 SIGPOLL */
-  "stop (cannot be caught or ignored)", /*  23 SIGSTOP */
-  "user stop requested from tty",	    /* 24 SIGTSTP */
-  "stopped process has been continued",	/* 25 SIGCONT */
-  "background tty read attempted",	    /* 26 SIGTTIN */
-  "background tty write attempted",    /* 27 SIGTTOU */
-  "virtual timer expired",		    /* 28 SIGVTALRM */
-  "profiling timer expired",		    /* 29 SIGPROF */
-  "exceeded cpu limit",			    /* 30 SIGXCPU */
-  "exceeded file size limit",		    /* 31 SIGXFSZ */
-  "process's lwps are blocked",	    /*  32 SIGWAITING */
-  "special signal used by thread library", /* 33 SIGLWP */
-#ifdef SIGFREEZE
-  "Special Signal Used By CPR",	    /* 34 SIGFREEZE */
-#endif
-#ifdef SIGTHAW
-  "Special Signal Used By CPR",	    /* 35 SIGTHAW */
-#endif
-#endif /* sun */
-#endif /* not AIX */
-  0
-  };
-#endif /* HAVE_SYS_SIGLIST */
-#endif /* HAVE_STRSIGNAL */
-
 /*
  *	Warning, this function may not duplicate 4.2 action properly
  *	under error conditions.
@@ -3396,82 +3479,6 @@ croak (badfunc)
 
 #endif /* USG */
 
-#ifdef DGUX
-
-#ifndef HAVE_STRSIGNAL
-char *sys_siglist[NSIG + 1] =
-{
-  "null signal",			 /*  0 SIGNULL   */
-  "hangup",				 /*  1 SIGHUP    */
-  "interrupt",		       		 /*  2 SIGINT    */
-  "quit",				 /*  3 SIGQUIT   */
-  "illegal instruction",		 /*  4 SIGILL    */
-  "trace trap",				 /*  5 SIGTRAP   */
-  "abort termination",			 /*  6 SIGABRT   */
-  "SIGEMT",				 /*  7 SIGEMT    */
-  "floating point exception",		 /*  8 SIGFPE    */
-  "kill",				 /*  9 SIGKILL   */
-  "bus error",				 /* 10 SIGBUS    */
-  "segmentation violation",		 /* 11 SIGSEGV   */
-  "bad argument to system call",	 /* 12 SIGSYS    */
-  "write on a pipe with no reader",	 /* 13 SIGPIPE   */
-  "alarm clock",			 /* 14 SIGALRM   */
-  "software termination signal",	 /* 15 SIGTERM   */
-  "user defined signal 1",		 /* 16 SIGUSR1   */
-  "user defined signal 2",		 /* 17 SIGUSR2   */
-  "child stopped or terminated",	 /* 18 SIGCLD    */
-  "power-fail restart",			 /* 19 SIGPWR    */
-  "window size changed",		 /* 20 SIGWINCH  */
-  "undefined",				 /* 21           */
-  "pollable event occurred",		 /* 22 SIGPOLL   */
-  "sendable stop signal not from tty",	 /* 23 SIGSTOP   */
-  "stop signal from tty",		 /* 24 SIGSTP    */
-  "continue a stopped process",		 /* 25 SIGCONT   */
-  "attempted background tty read",	 /* 26 SIGTTIN   */
-  "attempted background tty write",	 /* 27 SIGTTOU   */
-  "undefined",				 /* 28           */
-  "undefined",				 /* 29           */
-  "undefined",				 /* 30           */
-  "undefined",				 /* 31           */
-  "undefined",				 /* 32           */
-  "socket (TCP/IP) urgent data arrival", /* 33 SIGURG    */
-  "I/O is possible",			 /* 34 SIGIO     */
-  "exceeded cpu time limit",		 /* 35 SIGXCPU   */
-  "exceeded file size limit",		 /* 36 SIGXFSZ   */
-  "virtual time alarm",			 /* 37 SIGVTALRM */
-  "profiling time alarm",		 /* 38 SIGPROF   */
-  "undefined",				 /* 39           */
-  "file record locks revoked",		 /* 40 SIGLOST   */
-  "undefined",				 /* 41           */
-  "undefined",				 /* 42           */
-  "undefined",				 /* 43           */
-  "undefined",				 /* 44           */
-  "undefined",				 /* 45           */
-  "undefined",				 /* 46           */
-  "undefined",				 /* 47           */
-  "undefined",				 /* 48           */
-  "undefined",				 /* 49           */
-  "undefined",				 /* 50           */
-  "undefined",				 /* 51           */
-  "undefined",				 /* 52           */
-  "undefined",				 /* 53           */
-  "undefined",				 /* 54           */
-  "undefined",				 /* 55           */
-  "undefined",				 /* 56           */
-  "undefined",				 /* 57           */
-  "undefined",				 /* 58           */
-  "undefined",				 /* 59           */
-  "undefined",				 /* 60           */
-  "undefined",				 /* 61           */
-  "undefined",				 /* 62           */
-  "undefined",				 /* 63           */
-  "notification message in mess. queue", /* 64 SIGDGNOTIFY */
-  0
-};
-#endif /* HAVE_STRSIGNAL */
-
-#endif /* DGUX */
-
 /* Directory routines for systems that don't have them. */
 
 #ifdef SYSV_SYSTEM_DIR
@@ -6374,33 +6381,6 @@ getenv (const char * name)
 }
 
 #ifdef __MRC__
-/* see Interfaces&Libraries:Interfaces:CIncludes:signal.h */
-char *sys_siglist[] =
-{
-  "Zero is not a signal!!!",
-  "Abort",  /* 1 */
-  "Interactive user interrupt",  /* 2 */  "BAD",
-  "Floating point exception",  /* 4 */  "BAD", "BAD", "BAD",
-  "Illegal instruction",  /* 8 */  "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD",
-  "Segment violation",  /* 16 */  "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD", "BAD",
-  "Terminal"  /* 32 */
-};
-#elif __MWERKS__
-char *sys_siglist[] =
-{
-  "Zero is not a signal!!!",
-  "Abort",
-  "Floating point exception",
-  "Illegal instruction",
-  "Interactive user interrupt",
-  "Segment violation",
-  "Terminal"
-};
-#else
-You lose!!!
-#endif
-
-#ifdef __MRC__
 #include <utsname.h>
 
 int
diff --git a/src/w32proc.c b/src/w32proc.c
index 8a188015d85..21bdebbbecc 100644
--- a/src/w32proc.c
+++ b/src/w32proc.c
@@ -544,7 +544,7 @@ get_result:
 	  int code = WTERMSIG (retval);
 	  char *signame;
 
-	  synchronize_messages_locale ();
+	  synchronize_system_messages_locale ();
 	  signame = strsignal (code);
 
 	  if (signame == 0)
diff --git a/src/xfns.c b/src/xfns.c
index ffa8e6e495f..f915fa701bc 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -52,9 +52,6 @@ Boston, MA 02111-1307, USA.  */
 
 #ifdef HAVE_X_WINDOWS
 
-#ifndef STDC_HEADERS
-extern void abort ();
-#endif
 #include <ctype.h>
 
 /* On some systems, the character-composition stuff is broken in X11R5.  */