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 /Python | |
| 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 '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 55b9d50..e84943b 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -2237,6 +2237,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); |