diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:38:59 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:38:59 (GMT) |
| commit | b88ed1549e76fadf161227d15cc307f0e8b94c59 (patch) | |
| tree | 7fea10f9a15064480554f093da39f361df463c61 /Python/ceval.c | |
| parent | c8a03349d174379f051ab93d02a2918a15269e00 (diff) | |
| parent | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (diff) | |
| download | cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.zip cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.gz cpython-b88ed1549e76fadf161227d15cc307f0e8b94c59.tar.bz2 | |
#11565: Merge with 3.2.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 9572918..d2444aa 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -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++; |