Use the Python-specific Py_DEBUG macro rather than _DEBUG in Windows-related C code

Author: XuehaiPan

Include/internal/pycore_importdl.h

@@ -107,7 +107,7 @@ extern int _PyImport_RunModInitFunc(
 #include <windows.h>
 typedef FARPROC dl_funcptr;
 
-#ifdef _DEBUG
+#ifdef Py_DEBUG
 #  define PYD_DEBUG_SUFFIX "_d"
 #else
 #  define PYD_DEBUG_SUFFIX ""

Modules/_ctypes/callproc.c

@@ -92,7 +92,7 @@ module _ctypes
 #include <sanitizer/msan_interface.h>
 #endif
 
-#if defined(_DEBUG) || defined(__MINGW32__)
+#if defined(Py_DEBUG) || defined(__MINGW32__)
 /* Don't use structured exception handling on Windows if this is defined.
    MingW, AFAIK, doesn't support it.
 */

Modules/_ssl.c

@@ -4427,7 +4427,7 @@ _ssl__SSLContext_load_dh_params_impl(PySSLContext *self, PyObject *filepath)
     FILE *f;
     DH *dh;
 
-#if defined(MS_WINDOWS) && defined(_DEBUG)
+#if defined(MS_WINDOWS) && defined(Py_DEBUG)
     PyErr_SetString(PyExc_NotImplementedError,
                     "load_dh_params: unavailable on Windows debug build");
     return NULL;

Modules/_ssl/debughelpers.c

@@ -175,7 +175,7 @@ _PySSLContext_set_keylog_filename(PyObject *op, PyObject *arg,
     PySSLContext *self = PySSLContext_CAST(op);
     FILE *fp;
 
-#if defined(MS_WINDOWS) && defined(_DEBUG)
+#if defined(MS_WINDOWS) && defined(Py_DEBUG)
     PyErr_SetString(PyExc_NotImplementedError,
                     "set_keylog_filename: unavailable on Windows debug build");
     return -1;

PC/clinic/msvcrtmodule.c.h

@@ -140,7 +140,7 @@ static wchar_t * get_env(wchar_t * key)
     return buf;
 }
 
-#if defined(_DEBUG)
+#if defined(Py_DEBUG)
 /* Do not define EXECUTABLEPATH_VALUE in debug builds as it'll
    never point to the debug build. */
 #if defined(_WINDOWS)

PC/launcher.c

@@ -415,7 +415,7 @@ msvcrt_ungetwch_impl(PyObject *module, int unicode_char)
 
 #endif /* MS_WINDOWS_DESKTOP */
 
-#ifdef _DEBUG
+#ifdef Py_DEBUG
 /*[clinic input]
 msvcrt.CrtSetReportFile -> HANDLE
 
@@ -490,7 +490,7 @@ msvcrt_set_error_mode_impl(PyObject *module, int mode)
 
     return res;
 }
-#endif /* _DEBUG */
+#endif /* Py_DEBUG */
 
 #if defined(MS_WINDOWS_DESKTOP) || defined(MS_WINDOWS_APP) || defined(MS_WINDOWS_SYSTEM)
 
@@ -604,7 +604,7 @@ exec_module(PyObject* m)
     INSERTINT(m, "SEM_NOGPFAULTERRORBOX", SEM_NOGPFAULTERRORBOX);
     INSERTINT(m, "SEM_NOOPENFILEERRORBOX", SEM_NOOPENFILEERRORBOX);
 #endif
-#ifdef _DEBUG
+#ifdef Py_DEBUG
     INSERTINT(m, "CRT_WARN", _CRT_WARN);
     INSERTINT(m, "CRT_ERROR", _CRT_ERROR);
     INSERTINT(m, "CRT_ASSERT", _CRT_ASSERT);

PC/msvcrtmodule.c

@@ -94,6 +94,11 @@ WIN32 is still required for the locale module.
 #endif
 #endif /* Py_BUILD_CORE || Py_BUILD_CORE_BUILTIN || Py_BUILD_CORE_MODULE */
 
+/* _DEBUG implies Py_DEBUG */
+#ifdef _DEBUG
+#define Py_DEBUG
+#endif
+
 /* Define to 1 if you want to disable the GIL */
 /* Uncomment the definition for free-threaded builds, or define it manually
  * when compiling extension modules. Note that we test with #ifdef, so
@@ -319,21 +324,21 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
                         This is relevant when using build-system generator (e.g CMake) where
                         the linking is explicitly handled */
 #                       if defined(Py_GIL_DISABLED)
-#                       if defined(_DEBUG)
+#                       if defined(Py_DEBUG)
 #                               pragma comment(lib,"python314t_d.lib")
 #                       elif defined(Py_LIMITED_API)
 #                               pragma comment(lib,"python3t.lib")
 #                       else
 #                               pragma comment(lib,"python314t.lib")
-#                       endif /* _DEBUG */
+#                       endif /* Py_DEBUG */
 #                       else /* Py_GIL_DISABLED */
-#                       if defined(_DEBUG)
+#                       if defined(Py_DEBUG)
 #                               pragma comment(lib,"python314_d.lib")
 #                       elif defined(Py_LIMITED_API)
 #                               pragma comment(lib,"python3.lib")
 #                       else
 #                               pragma comment(lib,"python314.lib")
-#                       endif /* _DEBUG */
+#                       endif /* Py_DEBUG */
 #                       endif /* Py_GIL_DISABLED */
 #               endif /* _MSC_VER && !Py_NO_LINK_LIB */
 #       endif /* Py_BUILD_CORE */
@@ -376,11 +381,6 @@ Py_NO_ENABLE_SHARED to find out.  Also support MS_NO_COREDLL for b/w compat */
 #       define ALIGNOF_MAX_ALIGN_T 8
 #endif
 
-#ifdef _DEBUG
-#       define Py_DEBUG
-#endif
-
-
 #ifdef MS_WIN32
 
 #define SIZEOF_SHORT 2

PC/pyconfig.h.in

@@ -16,13 +16,13 @@
 #elif defined(PYW_ICON)
 1 ICON DISCARDABLE "icons\pythonw.ico"
 #else
-1 ICON DISCARDABLE "icons\launcher.ico" 
-2 ICON DISCARDABLE "icons\py.ico" 
-3 ICON DISCARDABLE "icons\pyc.ico" 
-4 ICON DISCARDABLE "icons\pyd.ico" 
+1 ICON DISCARDABLE "icons\launcher.ico"
+2 ICON DISCARDABLE "icons\py.ico"
+3 ICON DISCARDABLE "icons\pyc.ico"
+4 ICON DISCARDABLE "icons\pyd.ico"
 5 ICON DISCARDABLE "icons\python.ico"
 6 ICON DISCARDABLE "icons\pythonw.ico"
-7 ICON DISCARDABLE "icons\setup.ico" 
+7 ICON DISCARDABLE "icons\setup.ico"
 #endif
 
 1 USAGE "launcher-usage.txt"
@@ -37,7 +37,7 @@ VS_VERSION_INFO VERSIONINFO
  FILEVERSION PYVERSION64
  PRODUCTVERSION PYVERSION64
  FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
+#ifdef Py_DEBUG
  FILEFLAGS VS_FF_DEBUG
 #else
  FILEFLAGS 0x0L
@@ -64,4 +64,4 @@ BEGIN
     BEGIN
         VALUE "Translation", 0x0, 1200
     END
-END
+END

PC/pylauncher.rc

@@ -21,7 +21,7 @@ VS_VERSION_INFO VERSIONINFO
  FILEVERSION PYVERSION64
  PRODUCTVERSION PYVERSION64
  FILEFLAGSMASK 0x3fL
-#ifdef _DEBUG
+#ifdef Py_DEBUG
  FILEFLAGS VS_FF_DEBUG
 #else
  FILEFLAGS 0x0L
@@ -48,4 +48,4 @@ BEGIN
     BEGIN
         VALUE "Translation", 0x0, 1200
     END
-END
+END