Commit ca9c0567 authored by Paul Eggert's avatar Paul Eggert

* 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.
parent b718982a
......@@ -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);
}
......
......@@ -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))
......
......@@ -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)
{
......
......@@ -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;
}
......@@ -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);
......
......@@ -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;
{
......
......@@ -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 */
......
......@@ -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)
......
......@@ -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
......
This diff is collapsed.
......@@ -544,7 +544,7 @@ sys_wait (int *status)
int code = WTERMSIG (retval);
char *signame;
synchronize_messages_locale ();
synchronize_system_messages_locale ();
signame = strsignal (code);
if (signame == 0)
......
......@@ -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. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment