summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Lib/ctypes/test/test_bitfields.py15
-rw-r--r--Misc/NEWS3
-rw-r--r--Modules/_ctypes/cfield.c2
3 files changed, 19 insertions, 1 deletions
diff --git a/Lib/ctypes/test/test_bitfields.py b/Lib/ctypes/test/test_bitfields.py
index 2867cbf..ddd753e 100644
--- a/Lib/ctypes/test/test_bitfields.py
+++ b/Lib/ctypes/test/test_bitfields.py
@@ -215,6 +215,21 @@ class BitFieldTest(unittest.TestCase):
("b", c_ubyte, 4)]
self.failUnlessEqual(sizeof(X), sizeof(c_byte))
+ def test_mixed_4(self):
+ class X(Structure):
+ _fields_ = [("a", c_short, 4),
+ ("b", c_short, 4),
+ ("c", c_int, 24),
+ ("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.
+ if os.name in ("nt", "ce"):
+ self.failUnlessEqual(sizeof(X), sizeof(c_int) * 4)
+ else:
+ self.failUnlessEqual(sizeof(X), sizeof(c_int) * 2)
+
def test_anon_bitfields(self):
# anonymous bit-fields gave a strange error message
class X(Structure):
diff --git a/Misc/NEWS b/Misc/NEWS
index 0c22233..37bb634 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -15,6 +15,9 @@ Core and Builtins
Library
-------
+- Issue #3547: Fixed ctypes structures bitfields of varying integer
+ sizes.
+
- Issue #3879: A regression in urllib.getproxies_enviroment was fixed.
Build
diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index ba837ec..b9024bb 100644
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -163,7 +163,7 @@ CField_FromDesc(PyObject *desc, Py_ssize_t index,
break;
case EXPAND_BITFIELD:
- /* XXX needs more */
+ *poffset += dict->size - *pfield_size/8;
*psize += dict->size - *pfield_size/8;
*pfield_size = dict->size * 8;