#11565: Merge with 3.2.

This commit is contained in:
Ezio Melotti 2011-03-16 11:38:59 +02:00
commit b88ed1549e
93 changed files with 124 additions and 124 deletions

View file

@ -26,7 +26,7 @@
typedef unsigned long long uint64;
/* PowerPC suppport.
/* PowerPC support.
"__ppc__" appears to be the preprocessor definition to detect on OS X, whereas
"__powerpc__" appears to be the correct one for Linux with GCC
*/
@ -1266,7 +1266,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag)
if (_Py_atomic_load_relaxed(&eval_breaker)) {
if (*next_instr == SETUP_FINALLY) {
/* Make the last opcode before
a try: finally: block uninterruptable. */
a try: finally: block uninterruptible. */
goto fast_next_opcode;
}
tstate->tick_counter++;