diff options
author | Jean-Paul Calderone <exarkun@divmod.com> | 2010-05-08 21:11:28 (GMT) |
---|---|---|
committer | Jean-Paul Calderone <exarkun@divmod.com> | 2010-05-08 21:11:28 (GMT) |
commit | 0819b092d65315559d28c0c9774113bbb663af4a (patch) | |
tree | 5c2da09f92dee5811ee70a316e062f88ec424ac5 /Python | |
parent | 614813941dcb3846af93faa1f69731158e2d4c90 (diff) | |
download | cpython-0819b092d65315559d28c0c9774113bbb663af4a.zip cpython-0819b092d65315559d28c0c9774113bbb663af4a.tar.gz cpython-0819b092d65315559d28c0c9774113bbb663af4a.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 'Python')
-rw-r--r-- | Python/pythonrun.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 3ea4d8c..6774043 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1867,6 +1867,10 @@ PyOS_sighandler_t PyOS_setsig(int sig, PyOS_sighandler_t handler) { #ifdef HAVE_SIGACTION + /* Some code in Modules/signalmodule.c depends on sigaction() being + * used here if HAVE_SIGACTION is defined. Fix that if this code + * changes to invalidate that assumption. + */ struct sigaction context, ocontext; context.sa_handler = handler; sigemptyset(&context.sa_mask); |