traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged revisions 66683 via svnmerge from 

svn+ssh://pythondev@svn.python.org/python/trunk

........
  r66683 | thomas.heller | 2008-09-29 21:56:24 +0200 (Mo, 29 Sep 2008) | 1 line

  Fix issue #3547 for MingW, update comments.
........
This commit is contained in:
Thomas Heller 2008-09-29 20:03:53 +00:00
parent 4970215bb5
commit 28acc6cae5
2 changed files with 8 additions and 5 deletions
Show Stats 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 BitFieldTest(unittest.TestCase):
("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

@ -61,10 +61,12 @@ CField_FromDesc(PyObject *desc, Py_ssize_t 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 */