[Python-checkins] cpython (merge 3.1 -> 3.2): Merge with 3.2
ezio.melotti
python-checkins at python.org
Tue Mar 15 18:21:44 CET 2011
http://hg.python.org/cpython/rev/a46583c44086
changeset: 68506:a46583c44086
branch: 3.2
parent: 68501:983ed0ba44d0
parent: 68505:1ba77f3ccc2e
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Tue Mar 15 19:19:04 2011 +0200
summary:
Merge with 3.2
files:
Modules/_ctypes/libffi/ChangeLog
Modules/_ctypes/libffi/src/dlmalloc.c
Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
diff --git a/Modules/_ctypes/libffi/ChangeLog b/Modules/_ctypes/libffi/ChangeLog
--- a/Modules/_ctypes/libffi/ChangeLog
+++ b/Modules/_ctypes/libffi/ChangeLog
@@ -3084,7 +3084,7 @@
2003-09-18 Kaz Kojima <kkojima at 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 at 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
--- a/Modules/_ctypes/libffi/src/dlmalloc.c
+++ b/Modules/_ctypes/libffi/src/dlmalloc.c
@@ -1326,7 +1326,7 @@
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 @@
#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
--- a/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
+++ b/Modules/_ctypes/libffi/src/powerpc/ffi_darwin.c
@@ -592,7 +592,7 @@
+---------------------------------------+ 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
--- a/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
+++ b/Modules/_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c
@@ -650,7 +650,7 @@
+---------------------------------------+ 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
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list