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 /Python/pythonrun.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 'Python/pythonrun.c')
| -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 225d178..05a10c6 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); |