diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 17:19:04 (GMT) |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-15 17:19:04 (GMT) |
| commit | b78b4d7bf5264ae23f10c750883d7bd97fdb3afb (patch) | |
| tree | 0aaaef64754f2bdf78afa9b19dafb7371d8132d5 /Modules | |
| parent | 106f8e3ea48e247d6f4354890994f0b16fdcc8c4 (diff) | |
| parent | 8beaa6c2eca32351a6bc3204f4350176fd972fd6 (diff) | |
| download | cpython-b78b4d7bf5264ae23f10c750883d7bd97fdb3afb.zip cpython-b78b4d7bf5264ae23f10c750883d7bd97fdb3afb.tar.gz cpython-b78b4d7bf5264ae23f10c750883d7bd97fdb3afb.tar.bz2 | |
Merge with 3.2
Diffstat (limited to 'Modules')
| -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 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Modules/_ctypes/libffi/ChangeLog b/Modules/_ctypes/libffi/ChangeLog index 78853c4..00ba7ef 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 alignment + * src/sh/ffi.c (ffi_prep_args): Take account into the alignement 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 alignment bug, allocate 8 bytes for the result. + Fix alignement 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 72673a1..783c5c2 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 coalesced segments */ +/* This function supports releasing coalesed 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 contiguous morecore disabled or failed */ +/* mstate bit set if continguous 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 5e77720..d84f1c3 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 - | alignment to the next multiple of 16 | + | alignement 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 dba2184..8953d5f 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 - | alignment to the next multiple of 16 | + | alignement to the next multiple of 16 | SP current --> +---------------------------------------+ 176 <- parent frame | back chain to caller 4 | +---------------------------------------+ 180 |