From: Victor Stinner <vstinner@python.org>
Date: Tue, 3 May 2022 20:40:20 +0000 (+0200)
Subject: gh-91321: Fix PyModuleDef_HEAD_INIT on C++ (#92259)
X-Git-Tag: v3.11.0b1~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3a35b62ea003182c643516098cc781944d425800;p=thirdparty%2FPython%2Fcpython.git

gh-91321: Fix PyModuleDef_HEAD_INIT on C++ (#92259)

The PyModuleDef_HEAD_INIT macro now uses _Py_NULL to fix C++ compiler
warnings when using it in C++.
---

diff --git a/Include/moduleobject.h b/Include/moduleobject.h
index 8b62c45505fb..75abd2cf2b90 100644
--- a/Include/moduleobject.h
+++ b/Include/moduleobject.h
@@ -48,11 +48,11 @@ typedef struct PyModuleDef_Base {
   PyObject* m_copy;
 } PyModuleDef_Base;
 
-#define PyModuleDef_HEAD_INIT { \
-    PyObject_HEAD_INIT(NULL)    \
-    NULL, /* m_init */          \
-    0,    /* m_index */         \
-    NULL, /* m_copy */          \
+#define PyModuleDef_HEAD_INIT {  \
+    PyObject_HEAD_INIT(_Py_NULL) \
+    _Py_NULL, /* m_init */       \
+    0,        /* m_index */      \
+    _Py_NULL, /* m_copy */       \
   }
 
 #if !defined(Py_LIMITED_API) || Py_LIMITED_API+0 >= 0x03050000