Revert _DEBUG -> Py_DEBUG

Author: XuehaiPan

PC/launcher.c

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

PC/pyconfig.h.in

@@ -102,11 +102,6 @@ WIN32 is still required for the locale module.
 /* #define Py_GIL_DISABLED 1 */
 #endif
 
-// _DEBUG implies Py_DEBUG
-#ifdef _DEBUG
-#define Py_DEBUG
-#endif
-
 /* Compiler specific defines */
 
 /* ------------------------------------------------------------------------*/
@@ -324,21 +319,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(Py_DEBUG)
+#                       if defined(_DEBUG)
 #                               pragma comment(lib,"python314t_d.lib")
 #                       elif defined(Py_LIMITED_API)
 #                               pragma comment(lib,"python3t.lib")
 #                       else
 #                               pragma comment(lib,"python314t.lib")
-#                       endif /* Py_DEBUG */
+#                       endif /* _DEBUG */
 #                       else /* Py_GIL_DISABLED */
-#                       if defined(Py_DEBUG)
+#                       if defined(_DEBUG)
 #                               pragma comment(lib,"python314_d.lib")
 #                       elif defined(Py_LIMITED_API)
 #                               pragma comment(lib,"python3.lib")
 #                       else
 #                               pragma comment(lib,"python314.lib")
-#                       endif /* Py_DEBUG */
+#                       endif /* _DEBUG */
 #                       endif /* Py_GIL_DISABLED */
 #               endif /* _MSC_VER && !Py_NO_LINK_LIB */
 #       endif /* Py_BUILD_CORE */
@@ -381,6 +376,10 @@ 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
 

PC/python_uwp.cpp

@@ -19,13 +19,13 @@
 #include <winrt\Windows.Storage.h>
 
 #ifdef PYTHONW
-#ifdef Py_DEBUG
+#ifdef _DEBUG
 const wchar_t *PROGNAME = L"pythonw_d.exe";
 #else
 const wchar_t *PROGNAME = L"pythonw.exe";
 #endif
 #else
-#ifdef Py_DEBUG
+#ifdef _DEBUG
 const wchar_t *PROGNAME = L"python_d.exe";
 #else
 const wchar_t *PROGNAME = L"python.exe";

PC/python_ver_rc.h

@@ -10,7 +10,7 @@
 #define MS_WINDOWS
 #include "modsupport.h"
 #include "patchlevel.h"
-#ifdef Py_DEBUG
+#ifdef _DEBUG
 #   define PYTHON_DEBUG_EXT "_d"
 #else
 #   define PYTHON_DEBUG_EXT

Python/dynload_win.c

@@ -108,7 +108,7 @@ static char *GetPythonImport (HINSTANCE hModule)
                 char *pch;
 
                 /* Don't claim that python3.dll is a Python DLL. */
-#ifdef Py_DEBUG
+#ifdef _DEBUG
                 if (strcmp(import_name, "python3_d.dll") == 0) {
 #else
                 if (strcmp(import_name, "python3.dll") == 0) {
@@ -120,7 +120,7 @@ static char *GetPythonImport (HINSTANCE hModule)
                 /* Ensure python prefix is followed only
                    by numbers to the end of the basename */
                 pch = import_name + 6;
-#ifdef Py_DEBUG
+#ifdef _DEBUG
                 while (*pch && pch[0] != '_' && pch[1] != 'd' && pch[2] != '.') {
 #else
                 while (*pch && *pch != '.') {
@@ -300,7 +300,7 @@ dl_funcptr _PyImport_FindSharedFuncptrWindows(const char *prefix,
             char buffer[256];
 
             PyOS_snprintf(buffer, sizeof(buffer),
-#ifdef Py_DEBUG
+#ifdef _DEBUG
                           "python%d%d_d.dll",
 #else
                           "python%d%d.dll",