Fixups

Author: encukou

Lib/test/test_ctypes/test_c_simple_type_meta.py

@@ -160,7 +160,7 @@ def test_bad_type_message(self):
             class F(metaclass=PyCSimpleType):
                 _type_ = "\0"
         message = str(cm.exception)
-        expected_type_chars = list('cbBhHiIlLdCEFfuzZqQPOv?gX')
+        expected_type_chars = list('cbBhHiIlLdCEFfuzZqQPXOv?g')
         if not hasattr(ctypes, 'c_float_complex'):
             expected_type_chars.remove('C')
             expected_type_chars.remove('E')

Modules/_ctypes/cfield.c

@@ -1530,7 +1530,7 @@ _ctypes_init_fielddesc(void)
     PyMutex_Unlock(&mutex);
 }
 
-extern char *
+char *
 _ctypes_get_simple_type_chars(void) {
     _ctypes_init_fielddesc();
     return formattable.simple_type_chars;

Modules/_ctypes/ctypes.h

@@ -257,9 +257,7 @@ extern CThunkObject *_ctypes_alloc_callback(ctypes_state *st,
 /* a table entry describing a predefined ctypes type */
 struct fielddesc {
     char code;
-
-    ffi_type *pffi_type;  /* always statically allocated. */
-
+    ffi_type *pffi_type; /* always statically allocated */
     SETFUNC setfunc;
     GETFUNC getfunc;
     SETFUNC setfunc_swapped;