diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-07 01:46:44 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2012-09-07 01:46:44 -0700 |
| commit | 1a4f1e9b4805cd80952946b5f4461eeb467d9509 (patch) | |
| tree | 6f17957b784b3706a8bebe22c40475f5c8201af2 /src/syssignal.h | |
| parent | c640e87d077ae51c922b703f4b44f05dfb0d1cfd (diff) | |
| download | emacs-1a4f1e9b4805cd80952946b5f4461eeb467d9509.tar.gz | |
More signal-handler cleanup.
* configure.ac (FLOAT_CHECK_DOMAIN): Comment fix (Bug#12327).
* src/floatfns.c: Comment fix.
* src/lisp.h (force_auto_save_soon): Declare regardless of SIGDANGER.
SIGDANGER might not be in scope so "#ifdef SIGDANGER" is not right,
and anyway the declaration is harmless even if SIGDANGER is not defined.
* src/syssignal.h (SIGIO): Also #undef if (! defined FIONREAD ||
defined BROKEN_FIONREAD). systty.h formerly did this, but other
source files not surprisingly expected syssignal.h to define, or
not define, SIGIO, and it's cleaner to do it that way, for consistency.
Include <sys/ioctl.h>, for FIONREAD.
* src/systty.h (SIGIO): Do not #undef here; it's now syssignal.h's job.
This eliminates a problem whereby other files mysteriously had
to include "syssignal.h" before including "systty.h" if they
wanted to use "#ifdef SIGIO".
Diffstat (limited to 'src/syssignal.h')
| -rw-r--r-- | src/syssignal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/syssignal.h b/src/syssignal.h index fe7b5f0e150..c5529ae718a 100644 --- a/src/syssignal.h +++ b/src/syssignal.h @@ -38,9 +38,12 @@ extern void emacs_sigaction_init (struct sigaction *, signal_handler_t); _Noreturn void croak (char *); #endif -#if defined (SIGIO) && defined (BROKEN_SIGIO) +/* Interrupt input is not used if there is no FIONREAD. */ +#include <sys/ioctl.h> +#if defined BROKEN_SIGIO || ! defined FIONREAD || defined BROKEN_FIONREAD # undef SIGIO #endif + /* These are only used by AIX */ #if defined (SIGPOLL) && defined (BROKEN_SIGPOLL) #undef SIGPOLL |