[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r109921: More signal-handler cleanup.
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r109921: More signal-handler cleanup. |
Date: |
Fri, 07 Sep 2012 01:46:44 -0700 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 109921
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2012-09-07 01:46:44 -0700
message:
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".
modified:
ChangeLog
configure.ac
src/ChangeLog
src/floatfns.c
src/lisp.h
src/syssignal.h
src/systty.h
=== modified file 'ChangeLog'
--- a/ChangeLog 2012-09-07 01:27:44 +0000
+++ b/ChangeLog 2012-09-07 08:46:44 +0000
@@ -1,3 +1,8 @@
+2012-09-07 Paul Eggert <address@hidden>
+
+ More signal-handler cleanup (Bug#12327).
+ * configure.ac (FLOAT_CHECK_DOMAIN): Comment fix (Bug#12327).
+
2012-09-06 Paul Eggert <address@hidden>
Signal-handler cleanup (Bug#12327).
=== modified file 'configure.ac'
--- a/configure.ac 2012-09-07 01:27:44 +0000
+++ b/configure.ac 2012-09-07 08:46:44 +0000
@@ -3212,7 +3212,7 @@
someone else has modified in his/her Emacs.])
AH_TEMPLATE(FLOAT_CHECK_DOMAIN, [Define if the float library doesn't
- handle errors by either setting errno, or signaling SIGFPE/SIGILL.])
+ handle errors by either setting errno, or signaling SIGFPE.])
AH_TEMPLATE(HAVE_INVERSE_HYPERBOLIC, [Define if you have the functions
acosh, asinh, and atanh.])
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2012-09-07 08:20:07 +0000
+++ b/src/ChangeLog 2012-09-07 08:46:44 +0000
@@ -1,3 +1,20 @@
+2012-09-07 Paul Eggert <address@hidden>
+
+ More signal-handler cleanup (Bug#12327).
+ * floatfns.c: Comment fix.
+ * 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.
+ * 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.
+ * 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".
+
2012-09-07 Eli Zaretskii <address@hidden>
* w32proc.c (sigaction): New function, emulates Posix 'sigaction'.
=== modified file 'src/floatfns.c'
--- a/src/floatfns.c 2012-09-07 01:27:44 +0000
+++ b/src/floatfns.c 2012-09-07 08:46:44 +0000
@@ -38,7 +38,7 @@
This has no effect if HAVE_MATHERR is defined.
Define FLOAT_CHECK_DOMAIN if the float library doesn't handle errors by
- either setting errno, or signaling SIGFPE/SIGILL. Otherwise, domain and
+ either setting errno, or signaling SIGFPE. Otherwise, domain and
range checking will happen before calling the float routines. This has
no effect if HAVE_MATHERR is defined (since matherr will be called when
a domain error occurs.)
=== modified file 'src/lisp.h'
--- a/src/lisp.h 2012-09-05 21:33:53 +0000
+++ b/src/lisp.h 2012-09-07 08:46:44 +0000
@@ -3221,9 +3221,7 @@
extern Lisp_Object command_loop_1 (void);
extern Lisp_Object recursive_edit_1 (void);
extern void record_auto_save (void);
-#ifdef SIGDANGER
extern void force_auto_save_soon (void);
-#endif
extern void init_keyboard (void);
extern void syms_of_keyboard (void);
extern void keys_of_keyboard (void);
=== modified file 'src/syssignal.h'
--- a/src/syssignal.h 2012-09-07 06:47:30 +0000
+++ b/src/syssignal.h 2012-09-07 08:46:44 +0000
@@ -38,9 +38,12 @@
_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
=== modified file 'src/systty.h'
--- a/src/systty.h 2012-08-08 15:53:52 +0000
+++ b/src/systty.h 2012-09-07 08:46:44 +0000
@@ -47,11 +47,6 @@
#undef ASYNC
#endif
-/* Interrupt input is not used if there is no FIONREAD. */
-#ifndef FIONREAD
-#undef SIGIO
-#endif
-
/* Try to establish the correct character to disable terminal functions
in a system-independent manner. Note that USG (at least) define
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r109921: More signal-handler cleanup.,
Paul Eggert <=