diff options
author | Victor Stinner <vstinner@python.org> | 2022-01-28 00:39:52 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-28 00:39:52 +0100 |
commit | 18ea973c21ee4a6adc26be41027881043fa498eb (patch) | |
tree | 4d9f76fd0c776453372d81c83f48a6fc8cfab6ce /Include | |
parent | 0575551f69ba9c999835bfb176a543d468083c03 (diff) | |
download | cpython3-18ea973c21ee4a6adc26be41027881043fa498eb.tar.gz |
bpo-40170: Remove PyHeapType_GET_MEMBERS() macro (GH-30942)
Remove the PyHeapType_GET_MEMBERS() macro. It was exposed in the
public C API by mistake, it must only be used by Python internally.
Use the PyTypeObject.tp_members member instead.
Rename PyHeapType_GET_MEMBERS() to _PyHeapType_GET_MEMBERS() and move
it to the internal C API.
Diffstat (limited to 'Include')
-rw-r--r-- | Include/cpython/object.h | 4 | ||||
-rw-r--r-- | Include/internal/pycore_object.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Include/cpython/object.h b/Include/cpython/object.h index 0c3957aff4..7b9f3acbc4 100644 --- a/Include/cpython/object.h +++ b/Include/cpython/object.h @@ -293,10 +293,6 @@ typedef struct _heaptypeobject { /* 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) + Py_TYPE(etype)->tp_basicsize)) - PyAPI_FUNC(const char *) _PyType_Name(PyTypeObject *); PyAPI_FUNC(PyObject *) _PyType_Lookup(PyTypeObject *, PyObject *); PyAPI_FUNC(PyObject *) _PyType_LookupId(PyTypeObject *, _Py_Identifier *); diff --git a/Include/internal/pycore_object.h b/Include/internal/pycore_object.h index 5fe4ddb2ef..e2da2537c1 100644 --- a/Include/internal/pycore_object.h +++ b/Include/internal/pycore_object.h @@ -232,6 +232,10 @@ extern void _PyObject_FreeInstanceAttributes(PyObject *self); extern int _PyObject_IsInstanceDictEmpty(PyObject *); extern PyObject* _PyType_GetSubclasses(PyTypeObject *); +// Access macro to the members which are floating "behind" the object +#define _PyHeapType_GET_MEMBERS(etype) \ + ((PyMemberDef *)(((char *)etype) + Py_TYPE(etype)->tp_basicsize)) + #ifdef __cplusplus } #endif |