diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 09:35:38 (GMT) |
commit | 3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (patch) | |
tree | dd97578d333a72ac825c0e7ad64e4367d8dfe248 /Python/ceval.c | |
parent | cc4a4842643d6415ca4a449e9d0557cfb029715a (diff) | |
parent | 13925008dc11f2a235627dc8c0440c0ce99171d9 (diff) | |
download | cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.zip cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.gz cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.bz2 |
#11565: Merge with 3.1.
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 f6d4b0b..43a5c90 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 */ @@ -1282,7 +1282,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++; |