mirror of
https://github.com/masscollaborationlabs/emacs.git
synced 2025-07-03 19:03:24 +00:00
Remove (RET)SIGTYPE; it is identical to void on all supported systems.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2011-03/msg01068.html * configure.in (AC_TYPE_SIGNAL): Remove obsolete macro. (AH_BOTTOM): Do not define SIGTYPE. * lib-src/emacsclient.c: Replace SIGTYPE with void. * nt/config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void). * src/syssignal.h: Replace RETSIGTYPE with void. * src/atimer.c, src/data.c, src/dispnew.c, src/emacs.c, src/floatfns.c: * src/keyboard.c, src/keyboard.h, src/lisp.h, src/process.c, src/sysdep.c: * src/xterm.c: Replace SIGTYPE with void everywhere. * src/s/template.h (SIGTYPE): Remove commented out definition. * src/s/usg5-4-common.h (SIGTYPE): Remove definition. * admin/CPP-DEFINES: Remove SIGTYPE.
This commit is contained in:
parent
7a097943f7
commit
9af30bdf17
22 changed files with 52 additions and 61 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2011-03-27 Glenn Morris <rgm@gnu.org>
|
||||||
|
|
||||||
|
* configure.in (AC_TYPE_SIGNAL): Remove obsolete macro.
|
||||||
|
(AH_BOTTOM): Do not define SIGTYPE.
|
||||||
|
|
||||||
2011-03-26 Glenn Morris <rgm@gnu.org>
|
2011-03-26 Glenn Morris <rgm@gnu.org>
|
||||||
|
|
||||||
* configure.in: Replace obsolete macros AC_TRY_COMPILE, AC_TRY_LINK,
|
* configure.in: Replace obsolete macros AC_TRY_COMPILE, AC_TRY_LINK,
|
||||||
|
|
|
@ -58,7 +58,6 @@ HAVE_TERMIOS
|
||||||
INTERRUPT_INPUT
|
INTERRUPT_INPUT
|
||||||
NARROWPROTO
|
NARROWPROTO
|
||||||
SEPCHAR
|
SEPCHAR
|
||||||
SIGTYPE
|
|
||||||
SYSTEM_TYPE
|
SYSTEM_TYPE
|
||||||
|
|
||||||
** Machine specific macros, decribed in detail in src/m/template.h
|
** Machine specific macros, decribed in detail in src/m/template.h
|
||||||
|
@ -238,7 +237,6 @@ SIGNALS_VIA_CHARACTERS
|
||||||
SIGPIPE
|
SIGPIPE
|
||||||
SIGQUIT
|
SIGQUIT
|
||||||
SIGTRAP
|
SIGTRAP
|
||||||
SIGTYPE
|
|
||||||
SOLARIS2
|
SOLARIS2
|
||||||
STDC_HEADERS
|
STDC_HEADERS
|
||||||
SYSTEM_PURESIZE_EXTRA
|
SYSTEM_PURESIZE_EXTRA
|
||||||
|
|
|
@ -1227,9 +1227,6 @@ if test $emacs_cv_struct_utimbuf = yes; then
|
||||||
AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if `struct utimbuf' is declared by <utime.h>.])
|
AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, [Define to 1 if `struct utimbuf' is declared by <utime.h>.])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl checks for typedefs
|
|
||||||
AC_TYPE_SIGNAL
|
|
||||||
|
|
||||||
dnl Check for speed_t typedef.
|
dnl Check for speed_t typedef.
|
||||||
AC_CACHE_CHECK(for speed_t, emacs_cv_speed_t,
|
AC_CACHE_CHECK(for speed_t, emacs_cv_speed_t,
|
||||||
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <termios.h>]], [[speed_t x = 1;]])],
|
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <termios.h>]], [[speed_t x = 1;]])],
|
||||||
|
@ -3493,11 +3490,6 @@ AH_BOTTOM([
|
||||||
# define SYSTEM_PURESIZE_EXTRA 30000
|
# define SYSTEM_PURESIZE_EXTRA 30000
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* SIGTYPE is the macro we actually use. */
|
|
||||||
#ifndef SIGTYPE
|
|
||||||
#define SIGTYPE RETSIGTYPE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef emacs /* Don't do this for lib-src. */
|
#ifdef emacs /* Don't do this for lib-src. */
|
||||||
/* Tell regex.c to use a type compatible with Emacs. */
|
/* Tell regex.c to use a type compatible with Emacs. */
|
||||||
#define RE_TRANSLATE_TYPE Lisp_Object
|
#define RE_TRANSLATE_TYPE Lisp_Object
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
2011-03-27 Glenn Morris <rgm@gnu.org>
|
||||||
|
|
||||||
|
* emacsclient.c: Replace SIGTYPE with void.
|
||||||
|
|
||||||
2011-03-23 Juanma Barranquero <lekktu@gmail.com>
|
2011-03-23 Juanma Barranquero <lekktu@gmail.com>
|
||||||
|
|
||||||
* ntlib.c: Include <ctype.h>.
|
* ntlib.c: Include <ctype.h>.
|
||||||
|
|
|
@ -1116,7 +1116,7 @@ socket_status (char *name)
|
||||||
/* A signal handler that passes the signal to the Emacs process.
|
/* A signal handler that passes the signal to the Emacs process.
|
||||||
Useful for SIGWINCH. */
|
Useful for SIGWINCH. */
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
pass_signal_to_emacs (int signalnum)
|
pass_signal_to_emacs (int signalnum)
|
||||||
{
|
{
|
||||||
int old_errno = errno;
|
int old_errno = errno;
|
||||||
|
@ -1131,7 +1131,7 @@ pass_signal_to_emacs (int signalnum)
|
||||||
/* Signal handler for SIGCONT; notify the Emacs process that it can
|
/* Signal handler for SIGCONT; notify the Emacs process that it can
|
||||||
now resume our tty frame. */
|
now resume our tty frame. */
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
handle_sigcont (int signalnum)
|
handle_sigcont (int signalnum)
|
||||||
{
|
{
|
||||||
int old_errno = errno;
|
int old_errno = errno;
|
||||||
|
@ -1157,7 +1157,7 @@ handle_sigcont (int signalnum)
|
||||||
reality, we may get a SIGTSTP on C-z. Handling this signal and
|
reality, we may get a SIGTSTP on C-z. Handling this signal and
|
||||||
notifying Emacs about it should get things under control again. */
|
notifying Emacs about it should get things under control again. */
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
handle_sigtstp (int signalnum)
|
handle_sigtstp (int signalnum)
|
||||||
{
|
{
|
||||||
int old_errno = errno;
|
int old_errno = errno;
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
2011-03-27 Glenn Morris <rgm@gnu.org>
|
||||||
|
|
||||||
|
* config.nt: Remove RETSIGTYPE, SIGTYPE (identical to void).
|
||||||
|
|
||||||
2011-03-25 Juanma Barranquero <lekktu@gmail.com>
|
2011-03-25 Juanma Barranquero <lekktu@gmail.com>
|
||||||
|
|
||||||
* addpm.c (main): Remove unused variable `retval'.
|
* addpm.c (main): Remove unused variable `retval'.
|
||||||
|
|
|
@ -393,15 +393,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
#undef STACK_DIRECTION
|
#undef STACK_DIRECTION
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Define the return type of signal handlers if the s-xxx file
|
|
||||||
did not already do so. */
|
|
||||||
#define RETSIGTYPE void
|
|
||||||
|
|
||||||
/* SIGTYPE is the macro we actually use. */
|
|
||||||
#ifndef SIGTYPE
|
|
||||||
#define SIGTYPE RETSIGTYPE
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef emacs /* Don't do this for lib-src. */
|
#ifdef emacs /* Don't do this for lib-src. */
|
||||||
/* Tell regex.c to use a type compatible with Emacs. */
|
/* Tell regex.c to use a type compatible with Emacs. */
|
||||||
#define RE_TRANSLATE_TYPE Lisp_Object
|
#define RE_TRANSLATE_TYPE Lisp_Object
|
||||||
|
|
|
@ -1,3 +1,12 @@
|
||||||
|
2011-03-27 Glenn Morris <rgm@gnu.org>
|
||||||
|
|
||||||
|
* syssignal.h: Replace RETSIGTYPE with void.
|
||||||
|
* atimer.c, data.c, dispnew.c, emacs.c, floatfns.c, keyboard.c:
|
||||||
|
* keyboard.h, lisp.h, process.c, sysdep.c, xterm.c:
|
||||||
|
Replace SIGTYPE with void everywhere.
|
||||||
|
* s/usg5-4-common.h (SIGTYPE): Remove definition.
|
||||||
|
* s/template.h (SIGTYPE): Remove commented out definition.
|
||||||
|
|
||||||
2011-03-26 Eli Zaretskii <eliz@gnu.org>
|
2011-03-26 Eli Zaretskii <eliz@gnu.org>
|
||||||
|
|
||||||
* xdisp.c (redisplay_window): Don't check buffer's clip_changed
|
* xdisp.c (redisplay_window): Don't check buffer's clip_changed
|
||||||
|
|
|
@ -64,7 +64,7 @@ static void set_alarm (void);
|
||||||
static void schedule_atimer (struct atimer *);
|
static void schedule_atimer (struct atimer *);
|
||||||
static struct atimer *append_atimer_lists (struct atimer *,
|
static struct atimer *append_atimer_lists (struct atimer *,
|
||||||
struct atimer *);
|
struct atimer *);
|
||||||
SIGTYPE alarm_signal_handler (int signo);
|
void alarm_signal_handler (int signo);
|
||||||
|
|
||||||
|
|
||||||
/* Start a new atimer of type TYPE. TIME specifies when the timer is
|
/* Start a new atimer of type TYPE. TIME specifies when the timer is
|
||||||
|
@ -388,7 +388,7 @@ run_timers (void)
|
||||||
/* Signal handler for SIGALRM. SIGNO is the signal number, i.e.
|
/* Signal handler for SIGALRM. SIGNO is the signal number, i.e.
|
||||||
SIGALRM. */
|
SIGALRM. */
|
||||||
|
|
||||||
SIGTYPE
|
void
|
||||||
alarm_signal_handler (int signo)
|
alarm_signal_handler (int signo)
|
||||||
{
|
{
|
||||||
#ifndef SYNC_INPUT
|
#ifndef SYNC_INPUT
|
||||||
|
|
|
@ -3300,7 +3300,7 @@ syms_of_data (void)
|
||||||
XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1;
|
XSYMBOL (intern_c_string ("most-negative-fixnum"))->constant = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
arith_error (int signo)
|
arith_error (int signo)
|
||||||
{
|
{
|
||||||
sigsetmask (SIGEMPTYMASK);
|
sigsetmask (SIGEMPTYMASK);
|
||||||
|
|
|
@ -5566,7 +5566,7 @@ marginal_area_string (struct window *w, enum window_part part,
|
||||||
|
|
||||||
#ifdef SIGWINCH
|
#ifdef SIGWINCH
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
window_change_signal (int signalnum) /* If we don't have an argument, */
|
window_change_signal (int signalnum) /* If we don't have an argument, */
|
||||||
/* some compilers complain in signal calls. */
|
/* some compilers complain in signal calls. */
|
||||||
{
|
{
|
||||||
|
|
|
@ -308,7 +308,7 @@ pthread_t main_thread;
|
||||||
|
|
||||||
|
|
||||||
/* Handle bus errors, invalid instruction, etc. */
|
/* Handle bus errors, invalid instruction, etc. */
|
||||||
SIGTYPE
|
void
|
||||||
fatal_error_signal (int sig)
|
fatal_error_signal (int sig)
|
||||||
{
|
{
|
||||||
SIGNAL_THREAD_CHECK (sig);
|
SIGNAL_THREAD_CHECK (sig);
|
||||||
|
@ -345,7 +345,7 @@ fatal_error_signal (int sig)
|
||||||
#ifdef SIGDANGER
|
#ifdef SIGDANGER
|
||||||
|
|
||||||
/* Handler for SIGDANGER. */
|
/* Handler for SIGDANGER. */
|
||||||
SIGTYPE
|
void
|
||||||
memory_warning_signal (sig)
|
memory_warning_signal (sig)
|
||||||
int sig;
|
int sig;
|
||||||
{
|
{
|
||||||
|
|
|
@ -103,7 +103,7 @@ extern double logb (double);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef FLOAT_CATCH_SIGILL
|
#ifdef FLOAT_CATCH_SIGILL
|
||||||
static SIGTYPE float_error ();
|
static void float_error ();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* Nonzero while executing in floating point.
|
/* Nonzero while executing in floating point.
|
||||||
|
@ -126,7 +126,7 @@ static const char *float_error_fn_name;
|
||||||
Handle errors which may result in signals or may set errno.
|
Handle errors which may result in signals or may set errno.
|
||||||
|
|
||||||
Note that float_error may be declared to return void, so you can't
|
Note that float_error may be declared to return void, so you can't
|
||||||
just cast the zero after the colon to (SIGTYPE) to make the types
|
just cast the zero after the colon to (void) to make the types
|
||||||
check properly. */
|
check properly. */
|
||||||
|
|
||||||
#ifdef FLOAT_CHECK_ERRNO
|
#ifdef FLOAT_CHECK_ERRNO
|
||||||
|
@ -960,7 +960,7 @@ Rounds the value toward zero. */)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef FLOAT_CATCH_SIGILL
|
#ifdef FLOAT_CATCH_SIGILL
|
||||||
static SIGTYPE
|
static void
|
||||||
float_error (signo)
|
float_error (signo)
|
||||||
int signo;
|
int signo;
|
||||||
{
|
{
|
||||||
|
|
|
@ -434,15 +434,15 @@ static void restore_getcjmp (jmp_buf);
|
||||||
static Lisp_Object apply_modifiers (int, Lisp_Object);
|
static Lisp_Object apply_modifiers (int, Lisp_Object);
|
||||||
static void clear_event (struct input_event *);
|
static void clear_event (struct input_event *);
|
||||||
static Lisp_Object restore_kboard_configuration (Lisp_Object);
|
static Lisp_Object restore_kboard_configuration (Lisp_Object);
|
||||||
static SIGTYPE interrupt_signal (int signalnum);
|
static void interrupt_signal (int signalnum);
|
||||||
#ifdef SIGIO
|
#ifdef SIGIO
|
||||||
static SIGTYPE input_available_signal (int signo);
|
static void input_available_signal (int signo);
|
||||||
#endif
|
#endif
|
||||||
static void handle_interrupt (void);
|
static void handle_interrupt (void);
|
||||||
static void timer_start_idle (void);
|
static void timer_start_idle (void);
|
||||||
static void timer_stop_idle (void);
|
static void timer_stop_idle (void);
|
||||||
static void timer_resume_idle (void);
|
static void timer_resume_idle (void);
|
||||||
static SIGTYPE handle_user_signal (int);
|
static void handle_user_signal (int);
|
||||||
static char *find_user_signal_name (int);
|
static char *find_user_signal_name (int);
|
||||||
static int store_user_signal_events (void);
|
static int store_user_signal_events (void);
|
||||||
|
|
||||||
|
@ -7082,7 +7082,7 @@ process_pending_signals (void)
|
||||||
#ifdef SIGIO /* for entire page */
|
#ifdef SIGIO /* for entire page */
|
||||||
/* Note SIGIO has been undef'd if FIONREAD is missing. */
|
/* Note SIGIO has been undef'd if FIONREAD is missing. */
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
input_available_signal (int signo)
|
input_available_signal (int signo)
|
||||||
{
|
{
|
||||||
/* Must preserve main program's value of errno. */
|
/* Must preserve main program's value of errno. */
|
||||||
|
@ -7160,7 +7160,7 @@ add_user_signal (int sig, const char *name)
|
||||||
signal (sig, handle_user_signal);
|
signal (sig, handle_user_signal);
|
||||||
}
|
}
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
handle_user_signal (int sig)
|
handle_user_signal (int sig)
|
||||||
{
|
{
|
||||||
int old_errno = errno;
|
int old_errno = errno;
|
||||||
|
@ -10712,7 +10712,7 @@ clear_waiting_for_input (void)
|
||||||
SIGINT was generated by C-g, so we call handle_interrupt.
|
SIGINT was generated by C-g, so we call handle_interrupt.
|
||||||
Otherwise, the handler kills Emacs. */
|
Otherwise, the handler kills Emacs. */
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
interrupt_signal (int signalnum) /* If we don't have an argument, some */
|
interrupt_signal (int signalnum) /* If we don't have an argument, some */
|
||||||
/* compilers complain in signal calls. */
|
/* compilers complain in signal calls. */
|
||||||
{
|
{
|
||||||
|
|
|
@ -485,7 +485,7 @@ extern void push_frame_kboard (struct frame *);
|
||||||
extern void pop_kboard (void);
|
extern void pop_kboard (void);
|
||||||
extern void temporarily_switch_to_single_kboard (struct frame *);
|
extern void temporarily_switch_to_single_kboard (struct frame *);
|
||||||
extern void record_asynch_buffer_change (void);
|
extern void record_asynch_buffer_change (void);
|
||||||
extern SIGTYPE input_poll_signal (int);
|
extern void input_poll_signal (int);
|
||||||
extern void start_polling (void);
|
extern void start_polling (void);
|
||||||
extern void stop_polling (void);
|
extern void stop_polling (void);
|
||||||
extern void set_poll_suppress_count (int);
|
extern void set_poll_suppress_count (int);
|
||||||
|
|
|
@ -3181,7 +3181,7 @@ extern Lisp_Object decode_env_path (const char *, const char *);
|
||||||
extern Lisp_Object empty_unibyte_string, empty_multibyte_string;
|
extern Lisp_Object empty_unibyte_string, empty_multibyte_string;
|
||||||
extern Lisp_Object Qfile_name_handler_alist;
|
extern Lisp_Object Qfile_name_handler_alist;
|
||||||
extern void (*fatal_error_signal_hook) (void);
|
extern void (*fatal_error_signal_hook) (void);
|
||||||
extern SIGTYPE fatal_error_signal (int);
|
extern void fatal_error_signal (int);
|
||||||
EXFUN (Fkill_emacs, 1) NO_RETURN;
|
EXFUN (Fkill_emacs, 1) NO_RETURN;
|
||||||
#if HAVE_SETLOCALE
|
#if HAVE_SETLOCALE
|
||||||
void fixup_locale (void);
|
void fixup_locale (void);
|
||||||
|
|
|
@ -5470,7 +5470,7 @@ read_process_output (Lisp_Object proc, register int channel)
|
||||||
jmp_buf send_process_frame;
|
jmp_buf send_process_frame;
|
||||||
Lisp_Object process_sent_to;
|
Lisp_Object process_sent_to;
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
send_process_trap (int ignore)
|
send_process_trap (int ignore)
|
||||||
{
|
{
|
||||||
SIGNAL_THREAD_CHECK (SIGPIPE);
|
SIGNAL_THREAD_CHECK (SIGPIPE);
|
||||||
|
@ -5497,7 +5497,7 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
|
||||||
EMACS_INT rv;
|
EMACS_INT rv;
|
||||||
struct coding_system *coding;
|
struct coding_system *coding;
|
||||||
struct gcpro gcpro1;
|
struct gcpro gcpro1;
|
||||||
SIGTYPE (*volatile old_sigpipe) (int);
|
void (*volatile old_sigpipe) (int);
|
||||||
|
|
||||||
GCPRO1 (object);
|
GCPRO1 (object);
|
||||||
|
|
||||||
|
@ -5619,7 +5619,7 @@ send_process (volatile Lisp_Object proc, const char *volatile buf,
|
||||||
while (this > 0)
|
while (this > 0)
|
||||||
{
|
{
|
||||||
int outfd = p->outfd;
|
int outfd = p->outfd;
|
||||||
old_sigpipe = (SIGTYPE (*) (int)) signal (SIGPIPE, send_process_trap);
|
old_sigpipe = (void (*) (int)) signal (SIGPIPE, send_process_trap);
|
||||||
#ifdef DATAGRAM_SOCKETS
|
#ifdef DATAGRAM_SOCKETS
|
||||||
if (DATAGRAM_CHAN_P (outfd))
|
if (DATAGRAM_CHAN_P (outfd))
|
||||||
{
|
{
|
||||||
|
@ -6379,7 +6379,7 @@ process has been transmitted to the serial port. */)
|
||||||
indirectly; if it does, that is a bug */
|
indirectly; if it does, that is a bug */
|
||||||
|
|
||||||
#ifdef SIGCHLD
|
#ifdef SIGCHLD
|
||||||
static SIGTYPE
|
static void
|
||||||
sigchld_handler (int signo)
|
sigchld_handler (int signo)
|
||||||
{
|
{
|
||||||
int old_errno = errno;
|
int old_errno = errno;
|
||||||
|
|
|
@ -77,15 +77,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
a file that someone else has modified in his Emacs. */
|
a file that someone else has modified in his Emacs. */
|
||||||
#define CLASH_DETECTION
|
#define CLASH_DETECTION
|
||||||
|
|
||||||
/* Define this if your operating system declares signal handlers to
|
|
||||||
have a type other than the usual. `The usual' is `void' for ANSI C
|
|
||||||
systems (i.e. when the __STDC__ macro is defined), and `int' for
|
|
||||||
pre-ANSI systems. If you're using GCC on an older system, __STDC__
|
|
||||||
will be defined, but the system's include files will still say that
|
|
||||||
signal returns int or whatever; in situations like that, define
|
|
||||||
this to be what the system's include files want. */
|
|
||||||
/* #define SIGTYPE int */
|
|
||||||
|
|
||||||
/* If the character used to separate elements of the executable path
|
/* If the character used to separate elements of the executable path
|
||||||
is not ':', #define this to be the appropriate character constant. */
|
is not ':', #define this to be the appropriate character constant. */
|
||||||
/* #define SEPCHAR ':' */
|
/* #define SEPCHAR ':' */
|
||||||
|
|
|
@ -38,9 +38,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
|
||||||
/* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */
|
/* The docs for system V/386 suggest v.3 has sigpause, so let's try it. */
|
||||||
#define HAVE_SYSV_SIGPAUSE
|
#define HAVE_SYSV_SIGPAUSE
|
||||||
|
|
||||||
/* On USG systems signal handlers return void. */
|
|
||||||
#define SIGTYPE void
|
|
||||||
|
|
||||||
/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
|
/* Get FIONREAD from <sys/filio.h>. Get <sys/ttold.h> to get struct tchars.
|
||||||
But get <termio.h> first to make sure ttold.h doesn't interfere.
|
But get <termio.h> first to make sure ttold.h doesn't interfere.
|
||||||
And don't try to use SIGIO yet. */
|
And don't try to use SIGIO yet. */
|
||||||
|
|
|
@ -449,7 +449,7 @@ child_setup_tty (int out)
|
||||||
struct save_signal
|
struct save_signal
|
||||||
{
|
{
|
||||||
int code;
|
int code;
|
||||||
SIGTYPE (*handler) (int);
|
void (*handler) (int);
|
||||||
};
|
};
|
||||||
|
|
||||||
static void save_signal_handlers (struct save_signal *);
|
static void save_signal_handlers (struct save_signal *);
|
||||||
|
@ -608,7 +608,7 @@ save_signal_handlers (struct save_signal *saved_handlers)
|
||||||
while (saved_handlers->code)
|
while (saved_handlers->code)
|
||||||
{
|
{
|
||||||
saved_handlers->handler
|
saved_handlers->handler
|
||||||
= (SIGTYPE (*) (int)) signal (saved_handlers->code, SIG_IGN);
|
= (void (*) (int)) signal (saved_handlers->code, SIG_IGN);
|
||||||
saved_handlers++;
|
saved_handlers++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -69,7 +69,7 @@ extern sigset_t sys_sigmask ();
|
||||||
|
|
||||||
/* Whether this is what all systems want or not, this is what
|
/* Whether this is what all systems want or not, this is what
|
||||||
appears to be assumed in the source, for example data.c:arith_error. */
|
appears to be assumed in the source, for example data.c:arith_error. */
|
||||||
typedef RETSIGTYPE (*signal_handler_t) (int);
|
typedef void (*signal_handler_t) (int);
|
||||||
|
|
||||||
signal_handler_t sys_signal (int signal_number, signal_handler_t action);
|
signal_handler_t sys_signal (int signal_number, signal_handler_t action);
|
||||||
sigset_t sys_sigblock (sigset_t new_mask);
|
sigset_t sys_sigblock (sigset_t new_mask);
|
||||||
|
|
|
@ -349,7 +349,7 @@ static int handle_one_xevent (struct x_display_info *, XEvent *,
|
||||||
int *, struct input_event *);
|
int *, struct input_event *);
|
||||||
/* Don't declare this NO_RETURN because we want no
|
/* Don't declare this NO_RETURN because we want no
|
||||||
interference with debugging failing X calls. */
|
interference with debugging failing X calls. */
|
||||||
static SIGTYPE x_connection_closed (Display *, const char *);
|
static void x_connection_closed (Display *, const char *);
|
||||||
|
|
||||||
|
|
||||||
/* Flush display of frame F, or of all frames if F is null. */
|
/* Flush display of frame F, or of all frames if F is null. */
|
||||||
|
@ -7650,7 +7650,7 @@ x_trace_wire (void)
|
||||||
SIGPIPE will fail, causing Xlib to invoke the X IO error handler,
|
SIGPIPE will fail, causing Xlib to invoke the X IO error handler,
|
||||||
which will do the appropriate cleanup for us. */
|
which will do the appropriate cleanup for us. */
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
x_connection_signal (int signalnum) /* If we don't have an argument, */
|
x_connection_signal (int signalnum) /* If we don't have an argument, */
|
||||||
/* some compilers complain in signal calls. */
|
/* some compilers complain in signal calls. */
|
||||||
{
|
{
|
||||||
|
@ -7673,7 +7673,7 @@ static char *error_msg;
|
||||||
/* Handle the loss of connection to display DPY. ERROR_MESSAGE is
|
/* Handle the loss of connection to display DPY. ERROR_MESSAGE is
|
||||||
the text of an error message that lead to the connection loss. */
|
the text of an error message that lead to the connection loss. */
|
||||||
|
|
||||||
static SIGTYPE
|
static void
|
||||||
x_connection_closed (Display *dpy, const char *error_message)
|
x_connection_closed (Display *dpy, const char *error_message)
|
||||||
{
|
{
|
||||||
struct x_display_info *dpyinfo = x_display_info_for_display (dpy);
|
struct x_display_info *dpyinfo = x_display_info_for_display (dpy);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue