diff options
author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
---|---|---|
committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 03:59:46 (GMT) |
commit | 4969f709cc07088a40574c05724d83cddc8fafc7 (patch) | |
tree | ddb254d02f2bd0c4d9d7c141f5f95521669042a0 /Modules/_ctypes | |
parent | c48c19afe031d0a35a3d5aacddad4e113e1aeaf0 (diff) | |
parent | 42da663e6fe7ecbb89b17d596c76812a91bb99a4 (diff) | |
download | cpython-4969f709cc07088a40574c05724d83cddc8fafc7.zip cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.gz cpython-4969f709cc07088a40574c05724d83cddc8fafc7.tar.bz2 |
#11515: Merge with 3.1.
Diffstat (limited to 'Modules/_ctypes')
-rw-r--r-- | Modules/_ctypes/callproc.c | 2 | ||||
-rw-r--r-- | Modules/_ctypes/libffi/ChangeLog | 4 | ||||
-rw-r--r-- | Modules/_ctypes/libffi/src/dlmalloc.c | 4 | ||||
-rw-r--r-- | Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c | 2 | ||||
-rw-r--r-- | Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/Modules/_ctypes/callproc.c b/Modules/_ctypes/callproc.c index 737e4c3..3be270d 100644 --- a/Modules/_ctypes/callproc.c +++ b/Modules/_ctypes/callproc.c @@ -49,7 +49,7 @@ So, there are 4 data structures holding processed arguments: - the inargs tuple (in PyCFuncPtr_call) - the callargs tuple (in PyCFuncPtr_call) - - the 'struct argguments' array + - the 'struct arguments' array - the 'void *' array */ diff --git a/Modules/_ctypes/libffi/ChangeLog b/Modules/_ctypes/libffi/ChangeLog index 00ba7ef..78853c4 100644 --- a/Modules/_ctypes/libffi/ChangeLog +++ b/Modules/_ctypes/libffi/ChangeLog @@ -3084,7 +3084,7 @@ 2003-09-18 Kaz Kojima <kkojima@gcc.gnu.org> - * src/sh/ffi.c (ffi_prep_args): Take account into the alignement + * src/sh/ffi.c (ffi_prep_args): Take account into the alignment for the register size. (ffi_closure_helper_SYSV): Handle the structure return value address correctly. @@ -3344,7 +3344,7 @@ 2003-02-06 Andreas Tobler <a.tobler@schweiz.ch> * libffi/src/powerpc/darwin_closure.S: - Fix alignement bug, allocate 8 bytes for the result. + Fix alignment bug, allocate 8 bytes for the result. * libffi/src/powerpc/aix_closure.S: Likewise. * libffi/src/powerpc/ffi_darwin.c: diff --git a/Modules/_ctypes/libffi/src/dlmalloc.c b/Modules/_ctypes/libffi/src/dlmalloc.c index 783c5c2..72673a1 100644 --- a/Modules/_ctypes/libffi/src/dlmalloc.c +++ b/Modules/_ctypes/libffi/src/dlmalloc.c @@ -1326,7 +1326,7 @@ static void* win32direct_mmap(size_t size) { return (ptr != 0)? ptr: MFAIL; } -/* This function supports releasing coalesed segments */ +/* This function supports releasing coalesced segments */ static int win32munmap(void* ptr, size_t size) { MEMORY_BASIC_INFORMATION minfo; char* cptr = ptr; @@ -1362,7 +1362,7 @@ static int win32munmap(void* ptr, size_t size) { #define CALL_MORECORE(S) MFAIL #endif /* HAVE_MORECORE */ -/* mstate bit set if continguous morecore disabled or failed */ +/* mstate bit set if contiguous morecore disabled or failed */ #define USE_NONCONTIGUOUS_BIT (4U) /* segment bit set in create_mspace_with_base */ diff --git a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c index d84f1c3..5e77720 100644 --- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c +++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c @@ -592,7 +592,7 @@ typedef struct aix_fd_struct { +---------------------------------------+ 160 | result area 8 | +---------------------------------------+ 168 - | alignement to the next multiple of 16 | + | alignment to the next multiple of 16 | SP current --> +---------------------------------------+ 176 <- parent frame | back chain to caller 4 | +---------------------------------------+ 180 diff --git a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c index 8953d5f..dba2184 100644 --- a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c +++ b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c @@ -650,7 +650,7 @@ ffi_call( +---------------------------------------+ 160 | result area 8 | +---------------------------------------+ 168 - | alignement to the next multiple of 16 | + | alignment to the next multiple of 16 | SP current --> +---------------------------------------+ 176 <- parent frame | back chain to caller 4 | +---------------------------------------+ 180 |