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 /Include | |
| 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 'Include')
| -rw-r--r-- | Include/abstract.h | 4 | ||||
| -rw-r--r-- | Include/pymacconfig.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Include/abstract.h b/Include/abstract.h index 5f2d541..0fe0956 100644 --- a/Include/abstract.h +++ b/Include/abstract.h @@ -468,7 +468,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ arbitrary data. 0 is returned on success. buffer and buffer_len are only - set in case no error occurrs. Otherwise, -1 is returned and + set in case no error occurs. Otherwise, -1 is returned and an exception set. */ @@ -482,7 +482,7 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/ writable memory location in buffer of size buffer_len. 0 is returned on success. buffer and buffer_len are only - set in case no error occurrs. Otherwise, -1 is returned and + set in case no error occurs. Otherwise, -1 is returned and an exception set. */ diff --git a/Include/pymacconfig.h b/Include/pymacconfig.h index 6d4a971..24e7b8d 100644 --- a/Include/pymacconfig.h +++ b/Include/pymacconfig.h @@ -61,7 +61,7 @@ # endif # if defined(__LP64__) - /* MacOSX 10.4 (the first release to suppport 64-bit code + /* MacOSX 10.4 (the first release to support 64-bit code * at all) only supports 64-bit in the UNIX layer. * Therefore surpress the toolbox-glue in 64-bit mode. */ |