(original) (raw)

changeset: 70139:1aa48391da30 parent: 70136:c2515cb23d9b parent: 70138:b74999f561ca user: Victor Stinner victor.stinner@haypocalc.com date: Sun May 15 10:27:49 2011 +0200 files: Misc/NEWS Modules/signalmodule.c description: (Merge 3.2) Issue #12060: Use sig_atomic_t type and volatile keyword in the signal module. Patch written by Charles-François Natali. diff -r c2515cb23d9b -r 1aa48391da30 Misc/NEWS --- a/Misc/NEWS Sun May 15 00:26:45 2011 -0700 +++ b/Misc/NEWS Sun May 15 10:27:49 2011 +0200 @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #12060: Use sig_atomic_t type and volatile keyword in the signal + module. Patch written by Charles-François Natali. + - Added the if_nameindex, if_indextoname, if_nametoindex methods to the socket module as requested in issue #1746656. diff -r c2515cb23d9b -r 1aa48391da30 Modules/signalmodule.c --- a/Modules/signalmodule.c Sun May 15 00:26:45 2011 -0700 +++ b/Modules/signalmodule.c Sun May 15 10:27:49 2011 +0200 @@ -88,12 +88,12 @@ 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; /victor.stinner@haypocalc.com