diff options
author | Jean-Paul Calderone <exarkun@divmod.com> | 2010-05-09 03:25:16 (GMT) |
---|---|---|
committer | Jean-Paul Calderone <exarkun@divmod.com> | 2010-05-09 03:25:16 (GMT) |
commit | 9c39bc72650869755233bf08c3f3c78eb6c7ddfe (patch) | |
tree | 14e5c3fde1b000b9c95129b9ad077a0f1ab1fae8 /Modules/signalmodule.c | |
parent | f7c8902de217ececf33ea4d29f0f50e2e0eb79ba (diff) | |
download | cpython-9c39bc72650869755233bf08c3f3c78eb6c7ddfe.zip cpython-9c39bc72650869755233bf08c3f3c78eb6c7ddfe.tar.gz cpython-9c39bc72650869755233bf08c3f3c78eb6c7ddfe.tar.bz2 |
Merged revisions 81016 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r81016 | jean-paul.calderone | 2010-05-08 23:18:57 -0400 (Sat, 08 May 2010) | 9 lines
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 5d053f0..26a4e79 100644 --- a/Modules/signalmodule.c +++ b/Modules/signalmodule.c @@ -192,7 +192,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 } |