Py_NewRef() casts its argument to PyObject*

vstinner · vstinner · commit b3ac5c1f55b8 · 2020-12-03T13:05:16.000+01:00
diff --git a/pythoncapi_compat.h b/pythoncapi_compat.h
@@ -26,22 +26,24 @@ extern "C" {
 
 
 // bpo-42262 added Py_NewRef() to Python 3.10.0a3
-#if PY_VERSION_HEX < 0x030a00A3
-static inline PyObject* Py_NewRef(PyObject *obj)
+#if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_NewRef)
+static inline PyObject* _Py_NewRef(PyObject *obj)
 {
     Py_INCREF(obj);
     return obj;
 }
+#define Py_NewRef(obj) _Py_NewRef(_PyObject_CAST(obj))
 #endif
 
 
 // bpo-42262 added Py_XNewRef() to Python 3.10.0a3
-#if PY_VERSION_HEX < 0x030a00A3
-static inline PyObject* Py_XNewRef(PyObject *obj)
+#if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_XNewRef)
+static inline PyObject* _Py_XNewRef(PyObject *obj)
 {
     Py_XINCREF(obj);
     return obj;
 }
+#define Py_XNewRef(obj) _Py_XNewRef(_PyObject_CAST(obj))
 #endif
 
 

Original file line number	Diff line number	Diff line change
`@@ -26,22 +26,24 @@ extern "C" {`
`26`	`26`
`27`	`27`
`28`	`28`	`// bpo-42262 added Py_NewRef() to Python 3.10.0a3`
`29`		`-#if PY_VERSION_HEX < 0x030a00A3`
`30`		`-static inline PyObject* Py_NewRef(PyObject *obj)`
	`29`	`+#if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_NewRef)`
	`30`	`+static inline PyObject* _Py_NewRef(PyObject *obj)`
`31`	`31`	`{`
`32`	`32`	`Py_INCREF(obj);`
`33`	`33`	`return obj;`
`34`	`34`	`}`
	`35`	`+#define Py_NewRef(obj) _Py_NewRef(_PyObject_CAST(obj))`
`35`	`36`	`#endif`
`36`	`37`
`37`	`38`
`38`	`39`	`// bpo-42262 added Py_XNewRef() to Python 3.10.0a3`
`39`		`-#if PY_VERSION_HEX < 0x030a00A3`
`40`		`-static inline PyObject* Py_XNewRef(PyObject *obj)`
	`40`	`+#if PY_VERSION_HEX < 0x030a00A3 && !defined(Py_XNewRef)`
	`41`	`+static inline PyObject* _Py_XNewRef(PyObject *obj)`
`41`	`42`	`{`
`42`	`43`	`Py_XINCREF(obj);`
`43`	`44`	`return obj;`
`44`	`45`	`}`
	`46`	`+#define Py_XNewRef(obj) _Py_XNewRef(_PyObject_CAST(obj))`
`45`	`47`	`#endif`
`46`	`48`
`47`	`49`