From: Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com>
Date: Tue, 25 Jul 2023 15:35:49 +0000 (-0700)
Subject: [3.12] gh-105059: Fix MSCV compiler warning on PyObject union (GH-107239) (#107248)
X-Git-Tag: v3.12.0rc1~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9c31d9405027cea9c2d039ade672d604663ed5b0;p=thirdparty%2FPython%2Fcpython.git

[3.12] gh-105059: Fix MSCV compiler warning on PyObject union (GH-107239) (#107248)

gh-105059: Fix MSCV compiler warning on PyObject union (GH-107239)

Use pragma to ignore the MSCV compiler warning on the PyObject
nameless union.
(cherry picked from commit 1c8fe9bdb624d356643ee569151a9e4f2963179a)

Co-authored-by: Victor Stinner <vstinner@python.org>
---

diff --git a/Include/object.h b/Include/object.h
index 542f8d8c15a7..77434e3bc73c 100644
--- a/Include/object.h
+++ b/Include/object.h
@@ -165,10 +165,17 @@ check by comparing the reference count field to the immortality reference count.
  */
 struct _object {
     _PyObject_HEAD_EXTRA
+
 #if (defined(__GNUC__) || defined(__clang__)) \
         && !(defined __STDC_VERSION__ && __STDC_VERSION__ >= 201112L)
     // On C99 and older, anonymous union is a GCC and clang extension
     __extension__
+#endif
+#ifdef _MSC_VER
+    // Ignore MSC warning C4201: "nonstandard extension used:
+    // nameless struct/union"
+    __pragma(warning(push))
+    __pragma(warning(disable: 4201))
 #endif
     union {
        Py_ssize_t ob_refcnt;
@@ -176,6 +183,10 @@ struct _object {
        PY_UINT32_T ob_refcnt_split[2];
 #endif
     };
+#ifdef _MSC_VER
+    __pragma(warning(pop))
+#endif
+
     PyTypeObject *ob_type;
 };