From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Fri, 26 Apr 2024 05:29:45 +0000 (+0200)
Subject: [3.12] gh-118207: Rename the COMMON_FIELDS macro in funcobject.h and undef it after... 
X-Git-Tag: v3.12.4~171
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=82e26d6bd04d2e035b00bb5f157c887d41fd4769;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-118207: Rename the COMMON_FIELDS macro in funcobject.h and undef it after use (GH-118208) (#118269)

gh-118207: Rename the COMMON_FIELDS macro in funcobject.h and undef it after use (GH-118208)
(cherry picked from commit 796b3fb28057948ea5b98f7eb0c0f3af6a1e276e)

Co-authored-by: Itamar Oren <itamarost@gmail.com>
---

diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h
index 6f78f5868d01..23c8009c38d2 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)