← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/python2.5/oneiric

« back to all changes in this revision

Viewing changes to Modules/_ctypes/cfield.c

  • Committer: Bazaar Package Importer
  • Author(s): Matthias Klose
  • Date: 2008-12-21 08:57:49 UTC
  • mfrom: (1.1.9 upstream)
  • Revision ID: james.westby@ubuntu.com-20081221085749-bijjr25h8na5jdsu
Tags: 2.5.3-0ubuntu1
* New upstream version.
* Regenerate the included documentation.
* Add an option --install-layout=deb, which is ignored for 2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Modules/_ctypes/cfield.c
65
65
        }
66
66
        if (bitsize /* this is a bitfield request */
67
67
            && *pfield_size /* we have a bitfield open */
68
 
#if defined(MS_WIN32) && !defined(__MINGW32__)
69
 
            && dict->size * 8 == *pfield_size /* MSVC */
 
68
#ifdef MS_WIN32
 
69
            /* MSVC, GCC with -mms-bitfields */
 
70
            && dict->size * 8 == *pfield_size
70
71
#else
71
 
            && dict->size * 8 <= *pfield_size /* GCC, MINGW */
 
72
            /* GCC */
 
73
            && dict->size * 8 <= *pfield_size 
72
74
#endif
73
75
            && (*pbitofs + bitsize) <= *pfield_size) {
74
76
                /* continue bit field */
163
165
                break;
164
166
 
165
167
        case EXPAND_BITFIELD:
166
 
                /* XXX needs more */
 
168
                *poffset += dict->size - *pfield_size/8;
167
169
                *psize += dict->size - *pfield_size/8;
168
170
 
169
171
                *pfield_size = dict->size * 8;