Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
This commit is contained in:
Thomas Heller 2007-10-19 18:11:41 +00:00
parent a2ba6ea9aa
commit 91ac42243c
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -272,6 +272,9 @@ Core and builtins
Library 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 - Patch #1203: ctypes now does work on OS X when Python is built with
--disable-toolbox-glue --disable-toolbox-glue

16
Modules/_ctypes/cfield.c
View File

@ -1616,17 +1616,21 @@ static struct fielddesc formattable[] = {
/* XXX Hm, sizeof(int) == sizeof(long) doesn't hold on every platform */ /* 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 */ /* As soon as we can get rid of the type codes, this is no longer a problem */
#if SIZEOF_LONG == 4 #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_sint32, 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_uint32, L_set_sw, L_get_sw},
#elif SIZEOF_LONG == 8 #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_sint64, 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_uint64, L_set_sw, L_get_sw},
#else #else
# error # error
#endif #endif
#ifdef HAVE_LONG_LONG #ifdef HAVE_LONG_LONG
{ 'q', q_set, q_get, &ffi_type_slong, q_set_sw, q_get_sw}, #if SIZEOF_LONG_LONG == 8
{ 'Q', Q_set, Q_get, &ffi_type_ulong, Q_set_sw, Q_get_sw}, { '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 #endif
{ 'P', P_set, P_get, &ffi_type_pointer}, { 'P', P_set, P_get, &ffi_type_pointer},
{ 'z', z_set, z_get, &ffi_type_pointer}, { 'z', z_set, z_get, &ffi_type_pointer},