summaryrefslogtreecommitdiffstats
path: root/Modules/signalmodule.c
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-05-15 08:27:49 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-05-15 08:27:49 (GMT)
commitaedb2823fd740dcdf64744d47eab0053324741b1 (patch)
treee9ab73cd2500e6360d5f79529033644765cbede2 /Modules/signalmodule.c
parent5ed2e779f175dc648110a1d862e37d6e92bd2560 (diff)
parent5ebfe6d9a96beaa190e803259ffd05abe8786e14 (diff)
downloadcpython-aedb2823fd740dcdf64744d47eab0053324741b1.zip
cpython-aedb2823fd740dcdf64744d47eab0053324741b1.tar.gz
cpython-aedb2823fd740dcdf64744d47eab0053324741b1.tar.bz2
(Merge 3.2) Issue #12060: Use sig_atomic_t type and volatile keyword in the
signal module. Patch written by Charles-François Natali.
Diffstat (limited to 'Modules/signalmodule.c')
-rw-r--r--Modules/signalmodule.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c
index feeae5e..ff65f04 100644
--- a/Modules/signalmodule.c
+++ b/Modules/signalmodule.c
@@ -88,12 +88,12 @@ static long main_thread;
static pid_t main_pid;
#endif
-static struct {
- int tripped;
+static volatile struct {
+ sig_atomic_t tripped;
PyObject *func;
} Handlers[NSIG];
-static sig_atomic_t wakeup_fd = -1;
+static volatile sig_atomic_t wakeup_fd = -1;
/* Speed up sigcheck() when none tripped */
static volatile sig_atomic_t is_tripped = 0;