summaryrefslogtreecommitdiff
path: root/Python/pythonrun.c
diff options
context:
space:
mode:
authorJean-Paul Calderone <exarkun@divmod.com>2010-05-09 03:18:57 +0000
committerJean-Paul Calderone <exarkun@divmod.com>2010-05-09 03:18:57 +0000
commit30dd43e9dcd124029da3b83ace652cbebea43c7e (patch)
treed7902badf74dd977084a31aaa9032e28ef27ed55 /Python/pythonrun.c
parentc419ec9c4353fd512824db7e4327620038e32f18 (diff)
downloadcpython-30dd43e9dcd124029da3b83ace652cbebea43c7e.tar.gz
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/pythonrun.c')
-rw-r--r--Python/pythonrun.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 225d178986..05a10c61c4 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -2254,6 +2254,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);