diff options
| author | Georg Brandl <georg@python.org> | 2006-02-20 22:27:28 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2006-02-20 22:27:28 (GMT) |
| commit | c255c7bef7621596869f56d887ac3ccd5b536708 (patch) | |
| tree | 5d592563d175e59e1f14099aa25c6f5175b17948 /Include | |
| parent | 32cbc96150e4799d24ff04071f518e48b29f60a0 (diff) | |
| download | cpython-c255c7bef7621596869f56d887ac3ccd5b536708.zip cpython-c255c7bef7621596869f56d887ac3ccd5b536708.tar.gz cpython-c255c7bef7621596869f56d887ac3ccd5b536708.tar.bz2 | |
Bug #1086854: Rename PyHeapType members adding ht_ prefix.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/object.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Include/object.h b/Include/object.h index e3f825a..33b75be 100644 --- a/Include/object.h +++ b/Include/object.h @@ -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 */ |