Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2026-01-29 02:32:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix issue #3547 for MingW, update comments (backport from trunk).

Browse source
This commit is contained in:
Thomas Heller 2008-09-29 20:04:02 +00:00
parent 70f1192dfc
commit a702fd537d
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/ctypes/test/test_bitfields.py
View file

@ -223,8 +223,9 @@ class X(Structure):
("d", c_short, 4),
("e", c_short, 4),
("f", c_int, 24)]
# MS compilers do NOT combine c_short and c_int into
# one field, gcc does.
# MSVC does NOT combine c_short and c_int into one field, GCC
# does (unless GCC is run with '-mms-bitfields' which
# produces code compatible with MSVC).
if os.name in ("nt", "ce"):
self.failUnlessEqual(sizeof(X), sizeof(c_int) * 4)
else:

8
Modules/_ctypes/cfield.c
View file

@ -65,10 +65,12 @@ CField_FromDesc(PyObject *desc, int index,
}
if (bitsize /* this is a bitfield request */
&& *pfield_size /* we have a bitfield open */
#if defined(MS_WIN32) && !defined(__MINGW32__)
&& dict->size * 8 == *pfield_size /* MSVC */
#ifdef MS_WIN32
/* MSVC, GCC with -mms-bitfields */
&& dict->size * 8 == *pfield_size
#else
&& dict->size * 8 <= *pfield_size /* GCC, MINGW */
/* GCC */
&& dict->size * 8 <= *pfield_size
#endif
&& (*pbitofs + bitsize) <= *pfield_size) {
/* continue bit field */