Author: Armin Rigo <ar...@tunes.org> Branch: cffi-1.0 Changeset: r77238:77e07116b953 Date: 2015-05-08 22:24 +0200 http://bitbucket.org/pypy/pypy/changeset/77e07116b953/
Log: The struct names should not include the "struct " part here. diff --git a/pypy/module/_cffi_backend/parse_c_type.py b/pypy/module/_cffi_backend/parse_c_type.py --- a/pypy/module/_cffi_backend/parse_c_type.py +++ b/pypy/module/_cffi_backend/parse_c_type.py @@ -19,12 +19,12 @@ _nowrapper=True, **kwds) _CFFI_OPCODE_T = rffi.VOIDP -GLOBAL_S = rffi.CStruct('struct _cffi_global_s', +GLOBAL_S = rffi.CStruct('_cffi_global_s', ('name', rffi.CCHARP), ('address', rffi.VOIDP), ('type_op', _CFFI_OPCODE_T), ('size', rffi.SIZE_T)) -STRUCT_UNION_S = rffi.CStruct('struct _cffi_struct_union_s', +STRUCT_UNION_S = rffi.CStruct('_cffi_struct_union_s', ('name', rffi.CCHARP), ('type_index', rffi.INT), ('flags', rffi.INT), @@ -32,21 +32,21 @@ ('alignment', rffi.INT), ('first_field_index', rffi.INT), ('num_fields', rffi.INT)) -FIELD_S = rffi.CStruct('struct _cffi_field_s', +FIELD_S = rffi.CStruct('_cffi_field_s', ('name', rffi.CCHARP), ('field_offset', rffi.SIZE_T), ('field_size', rffi.SIZE_T), ('field_type_op', _CFFI_OPCODE_T)) -ENUM_S = rffi.CStruct('struct _cffi_enum_s', +ENUM_S = rffi.CStruct('_cffi_enum_s', ('name', rffi.CCHARP), ('type_index', rffi.INT), ('type_prim', rffi.INT), ('enumerators', rffi.CCHARP)) -TYPENAME_S = rffi.CStruct('struct _cffi_typename_s', +TYPENAME_S = rffi.CStruct('_cffi_typename_s', ('name', rffi.CCHARP), ('type_index', rffi.INT)) -PCTX = rffi.CStructPtr('struct _cffi_type_context_s', +PCTX = rffi.CStructPtr('_cffi_type_context_s', ('types', rffi.VOIDPP), ('globals', rffi.CArrayPtr(GLOBAL_S)), ('fields', rffi.CArrayPtr(FIELD_S)), @@ -61,7 +61,7 @@ ('num_types', rffi.INT), ('flags', rffi.INT)) -PINFO = rffi.CStructPtr('struct _cffi_parse_info_s', +PINFO = rffi.CStructPtr('_cffi_parse_info_s', ('ctx', PCTX), ('output', rffi.VOIDPP), ('output_size', rffi.UINT), _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit