diff options
| author | Itamar Oren <itamarost@gmail.com> | 2024-04-25 06:49:15 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-25 06:49:15 (GMT) |
| commit | 796b3fb28057948ea5b98f7eb0c0f3af6a1e276e (patch) | |
| tree | dd5f6b7ba115996f01bd1b9760c93425ae80b54c /Include/cpython | |
| parent | 546cbcfa0eeeb533950bd49e30423f3d3bbd5ebe (diff) | |
| download | cpython-796b3fb28057948ea5b98f7eb0c0f3af6a1e276e.zip cpython-796b3fb28057948ea5b98f7eb0c0f3af6a1e276e.tar.gz cpython-796b3fb28057948ea5b98f7eb0c0f3af6a1e276e.tar.bz2 | |
gh-118207: Rename the COMMON_FIELDS macro in funcobject.h and undef it after use (GH-118208)
Diffstat (limited to 'Include/cpython')
| -rw-r--r-- | Include/cpython/funcobject.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h index de20133..5433ba4 100644 --- a/Include/cpython/funcobject.h +++ b/Include/cpython/funcobject.h @@ -8,7 +8,7 @@ extern "C" { #endif -#define COMMON_FIELDS(PREFIX) \ +#define _Py_COMMON_FIELDS(PREFIX) \ PyObject *PREFIX ## globals; \ PyObject *PREFIX ## builtins; \ PyObject *PREFIX ## name; \ @@ -19,7 +19,7 @@ extern "C" { PyObject *PREFIX ## closure; /* NULL or a tuple of cell objects */ typedef struct { - COMMON_FIELDS(fc_) + _Py_COMMON_FIELDS(fc_) } PyFrameConstructor; /* Function objects and code objects should not be confused with each other: @@ -35,7 +35,7 @@ typedef struct { typedef struct { PyObject_HEAD - COMMON_FIELDS(func_) + _Py_COMMON_FIELDS(func_) PyObject *func_doc; /* The __doc__ attribute, can be anything */ PyObject *func_dict; /* The __dict__ attribute, a dict or NULL */ PyObject *func_weakreflist; /* List of weak references */ @@ -60,6 +60,8 @@ typedef struct { */ } PyFunctionObject; +#undef _Py_COMMON_FIELDS + PyAPI_DATA(PyTypeObject) PyFunction_Type; #define PyFunction_Check(op) Py_IS_TYPE((op), &PyFunction_Type) |