From 6ed9be1a553e1b6d63410348549fb033f6220d88 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Tue, 7 Oct 2025 18:41:45 +0200 Subject: [PATCH] [3.14] gh-137058: Sync _Py_NULL macro with the main branch (#137409) 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 3eac119bf8e8..44894419f623 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 -- 2.47.3