Commit632d1aa

authored

Don't redefine _Py_NULL macro if already defined (#138)

Original mypy fix by Michael R. Crusoe.

1 parentc84545f commit632d1aaCopy full SHA for 632d1aa

File tree

-5

lines changed

-5

lines changed

Lines changed: 7 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,13 @@ extern "C" {`
`37`	`37`	`// Static inline functions should use _Py_NULL rather than using directly NULL`
`38`	`38`	`// to prevent C++ compiler warnings. On C23 and newer and on C++11 and newer,`
`39`	`39`	`// _Py_NULL is defined as nullptr.`
`40`		`-#if (defined (__STDC_VERSION__) && __STDC_VERSION__ > 201710L) \`
`41`		`- \|\| (defined(__cplusplus) && __cplusplus >=201103)`
`42`		`-#define_Py_NULLnullptr`
`43`		`-#else`
`44`		`-#define_Py_NULLNULL`
	`40`	`+#ifndef _Py_NULL`
	`41`	`+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ > 201710L) \`
	`42`	`+ \|\| (defined(__cplusplus) && __cplusplus >=201103)`
	`43`	`+#define_Py_NULLnullptr`
	`44`	`+#else`
	`45`	`+#define_Py_NULLNULL`
	`46`	`+#endif`
`45`	`47`	`#endif`
`46`	`48`
`47`	`49`	`// Cast argument to PyObject* type.`

Comments

(0)