From d4b850c89c3950b85b4f8d2abf4dbe092f8f5307 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 5 Aug 2025 10:37:44 +0200 Subject: [PATCH] gh-137058: Sync _Py_NULL macro with the main branch * use __STDC_VERSION__ >= 202311L instead of __STDC_VERSION__ > 201710L. * Check for _MSC_VER. --- Include/pyport.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Include/pyport.h b/Include/pyport.h index 3eac119bf8e8d8..44894419f6231d 100644 --- a/Include/pyport.h +++ b/Include/pyport.h @@ -49,8 +49,9 @@ // Static inline functions should use _Py_NULL rather than using directly NULL // to prevent C++ compiler warnings. On C23 and newer and on C++11 and newer, // _Py_NULL is defined as nullptr. -#if (defined (__STDC_VERSION__) && __STDC_VERSION__ > 201710L) \ - || (defined(__cplusplus) && __cplusplus >= 201103) +#if !defined(_MSC_VER) && \ + ((defined (__STDC_VERSION__) && __STDC_VERSION__ >= 202311L) \ + || (defined(__cplusplus) && __cplusplus >= 201103)) # define _Py_NULL nullptr #else # define _Py_NULL NULL