From: Thomas Heller <theller@ctypes.org>
Date: Wed, 5 Jul 2006 09:13:56 +0000 (+0000)
Subject: Fix the bitfield test when _ctypes is compiled with MingW.  Structures
X-Git-Tag: v2.5b2~56
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ba7ca82298fabe84b633514317d795b42eef770;p=thirdparty%2FPython%2Fcpython.git

Fix the bitfield test when _ctypes is compiled with MingW.  Structures
containing bitfields may have different layout on MSVC and MingW .
---

diff --git a/Modules/_ctypes/cfield.c b/Modules/_ctypes/cfield.c
index 68fac67003c8..c5895f095e8d 100644
--- a/Modules/_ctypes/cfield.c
+++ b/Modules/_ctypes/cfield.c
@@ -65,10 +65,10 @@ CField_FromDesc(PyObject *desc, int index,
 	}
 	if (bitsize /* this is a bitfield request */
 	    && *pfield_size /* we have a bitfield open */
-#ifdef MS_WIN32
+#if defined(MS_WIN32) && !defined(__MINGW32__)
 	    && dict->size * 8 == *pfield_size /* MSVC */
 #else
-	    && dict->size * 8 <= *pfield_size /* GCC */
+	    && dict->size * 8 <= *pfield_size /* GCC, MINGW */
 #endif
 	    && (*pbitofs + bitsize) <= *pfield_size) {
 		/* continue bit field */