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 /Include/abstract.h | |
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 'Include/abstract.h')
-rw-r--r-- | Include/abstract.h | 4 |
1 files changed, 2 insertions, 2 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. */ |