Bug #1086854: Rename PyHeapType members adding ht_ prefix.

This commit is contained in:
Georg Brandl 2006-02-20 22:27:28 +00:00
parent 32cbc96150
commit c255c7bef7
2 changed files with 12 additions and 12 deletions

View file

@ -345,7 +345,7 @@ typedef struct _typeobject {
typedef struct _heaptypeobject {
/* Note: there's a dependency on the order of these members
in slotptr() in typeobject.c . */
PyTypeObject type;
PyTypeObject ht_type;
PyNumberMethods as_number;
PyMappingMethods as_mapping;
PySequenceMethods as_sequence; /* as_sequence comes after as_mapping,
@ -354,13 +354,13 @@ typedef struct _heaptypeobject {
a given operator (e.g. __getitem__).
see add_operators() in typeobject.c . */
PyBufferProcs as_buffer;
PyObject *name, *slots;
PyObject *ht_name, *ht_slots;
/* here are optional user slots, followed by the members. */
} PyHeapTypeObject;
/* access macro to the members which are floating "behind" the object */
#define PyHeapType_GET_MEMBERS(etype) \
((PyMemberDef *)(((char *)etype) + (etype)->type.ob_type->tp_basicsize))
((PyMemberDef *)(((char *)etype) + (etype)->ht_type.ob_type->tp_basicsize))
/* Generic type check */