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 | |
| 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')
| -rw-r--r-- | Python/ceval.c | 4 | ||||
| -rw-r--r-- | Python/pystate.c | 2 | ||||
| -rw-r--r-- | Python/thread.c | 2 |
3 files changed, 4 insertions, 4 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++; diff --git a/Python/pystate.c b/Python/pystate.c index d5d98b0..922e9a3 100644 --- a/Python/pystate.c +++ b/Python/pystate.c @@ -512,7 +512,7 @@ _PyThread_CurrentFrames(void) /* for i in all interpreters: * for t in all of i's thread states: * if t's frame isn't NULL, map t's id to its frame - * Because these lists can mutute even when the GIL is held, we + * Because these lists can mutate even when the GIL is held, we * need to grab head_mutex for the duration. */ HEAD_LOCK(); diff --git a/Python/thread.c b/Python/thread.c index 09beaef..d224046 100644 --- a/Python/thread.c +++ b/Python/thread.c @@ -40,7 +40,7 @@ #endif /* Check if we're running on HP-UX and _SC_THREADS is defined. If so, then - enough of the Posix threads package is implimented to support python + enough of the Posix threads package is implemented to support python threads. This is valid for HP-UX 11.23 running on an ia64 system. If needed, add |