diff options
| author | Jean-Paul Calderone <exarkun@divmod.com> | 2010-05-09 03:18:57 (GMT) |
|---|---|---|
| committer | Jean-Paul Calderone <exarkun@divmod.com> | 2010-05-09 03:18:57 (GMT) |
| commit | 6f137ca4693a9c37ec012846aebc02f6863547be (patch) | |
| tree | 56e041a97ab549cc23f5fe1183a7840a2aa794c2 /Modules/signalmodule.c | |
| parent | bf9bcab98e194780f11ccd59803cb2bb71752e83 (diff) | |
| download | cpython-6f137ca4693a9c37ec012846aebc02f6863547be.zip cpython-6f137ca4693a9c37ec012846aebc02f6863547be.tar.gz cpython-6f137ca4693a9c37ec012846aebc02f6863547be.tar.bz2 | |
Merged revisions 81007 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r81007 | jean-paul.calderone | 2010-05-08 16:06:02 -0400 (Sat, 08 May 2010) | 1 line
Skip signal handler re-installation if it is not necessary. Issue 8354.
........
Diffstat (limited to 'Modules/signalmodule.c')
| -rw-r--r-- | Modules/signalmodule.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c index 0039777..6437cb4 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -198,7 +198,12 @@ signal_handler(int sig_num) return; } #endif +#ifndef HAVE_SIGACTION + /* If the handler was not set up with sigaction, reinstall it. See + * Python/pythonrun.c for the implementation of PyOS_setsig which + * makes this true. See also issue8354. */ PyOS_setsig(sig_num, signal_handler); +#endif } |