summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2011-03-16 09:35:38 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2011-03-16 09:35:38 (GMT)
commit3b3499ba69341a49fc842ce0d4a2f66fcb249a04 (patch)
treedd97578d333a72ac825c0e7ad64e4367d8dfe248 /Include
parentcc4a4842643d6415ca4a449e9d0557cfb029715a (diff)
parent13925008dc11f2a235627dc8c0440c0ce99171d9 (diff)
downloadcpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.zip
cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.gz
cpython-3b3499ba69341a49fc842ce0d4a2f66fcb249a04.tar.bz2
#11565: Merge with 3.1.
Diffstat (limited to 'Include')
-rw-r--r--Include/abstract.h4
-rw-r--r--Include/pymacconfig.h2
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.
*/