diff options
| author | Thomas Heller <theller@ctypes.org> | 2007-10-19 18:11:41 (GMT) |
|---|---|---|
| committer | Thomas Heller <theller@ctypes.org> | 2007-10-19 18:11:41 (GMT) |
| commit | 91ac42243cd010691b082a0b2fdd414e6d47456c (patch) | |
| tree | fec84c4fd353a917c275d8eb5db805093b72cc4f | |
| parent | a2ba6ea9aa0a766424cc163349007bac9c304568 (diff) | |
| download | cpython-91ac42243cd010691b082a0b2fdd414e6d47456c.zip cpython-91ac42243cd010691b082a0b2fdd414e6d47456c.tar.gz cpython-91ac42243cd010691b082a0b2fdd414e6d47456c.tar.bz2 | |
Fix ctypes on 32-bit systems when Python is configured --with-system-ffi.
See also https://bugs.launchpad.net/bugs/72505.
Ported from release25-maint branch.
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Modules/_ctypes/cfield.c | 16 |
2 files changed, 13 insertions, 6 deletions
@@ -272,6 +272,9 @@ Core and builtins Library ------- +- ctypes will now work correctly on 32-bit systems when Python is + configured with --with-system-ffi. + - Patch #1203: ctypes now does work on OS X when Python is built with --disable-toolbox-glue diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c index 2f2616f..5f5fd99 100644 --- a/Modules/_ctypes/cfield.c +++ b/Modules/_ctypes/cfield.c @@ -1616,17 +1616,21 @@ static struct fielddesc formattable[] = { /* XXX Hm, sizeof(int) == sizeof(long) doesn't hold on every platform */ /* As soon as we can get rid of the type codes, this is no longer a problem */ #if SIZEOF_LONG == 4 - { 'l', l_set, l_get, &ffi_type_sint, l_set_sw, l_get_sw}, - { 'L', L_set, L_get, &ffi_type_uint, L_set_sw, L_get_sw}, + { 'l', l_set, l_get, &ffi_type_sint32, l_set_sw, l_get_sw}, + { 'L', L_set, L_get, &ffi_type_uint32, L_set_sw, L_get_sw}, #elif SIZEOF_LONG == 8 - { 'l', l_set, l_get, &ffi_type_slong, l_set_sw, l_get_sw}, - { 'L', L_set, L_get, &ffi_type_ulong, L_set_sw, L_get_sw}, + { 'l', l_set, l_get, &ffi_type_sint64, l_set_sw, l_get_sw}, + { 'L', L_set, L_get, &ffi_type_uint64, L_set_sw, L_get_sw}, #else # error #endif #ifdef HAVE_LONG_LONG - { 'q', q_set, q_get, &ffi_type_slong, q_set_sw, q_get_sw}, - { 'Q', Q_set, Q_get, &ffi_type_ulong, Q_set_sw, Q_get_sw}, +#if SIZEOF_LONG_LONG == 8 + { 'q', q_set, q_get, &ffi_type_sint64, q_set_sw, q_get_sw}, + { 'Q', Q_set, Q_get, &ffi_type_uint64, Q_set_sw, Q_get_sw}, +#else +# error +#endif #endif { 'P', P_set, P_get, &ffi_type_pointer}, { 'z', z_set, z_get, &ffi_type_pointer}, |