From 6b24352461d7e62f6dafd7ae737179c70261a3dd Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 18 Mar 2021 03:21:36 +0100 Subject: [PATCH 1/2] bpo-43244: Fix test_peg_generators on Windows Don't redefine Py_DebugFlag, it's already defined in pydebug.h which is included by Python.h --- Tools/peg_generator/pegen/c_generator.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Tools/peg_generator/pegen/c_generator.py b/Tools/peg_generator/pegen/c_generator.py index 929ec4f547e172..24418ea70e448b 100644 --- a/Tools/peg_generator/pegen/c_generator.py +++ b/Tools/peg_generator/pegen/c_generator.py @@ -31,10 +31,9 @@ #include "pegen.h" #if defined(Py_DEBUG) && defined(Py_BUILD_CORE) -extern int Py_DebugFlag; -#define D(x) if (Py_DebugFlag) x; +# define D(x) if (Py_DebugFlag) x; #else -#define D(x) +# define D(x) #endif """ From 862541e6dcc46789f2f861ef2fb74bba095f1b95 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Thu, 18 Mar 2021 09:00:10 +0100 Subject: [PATCH 2/2] Run make regen-all --- Parser/parser.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Parser/parser.c b/Parser/parser.c index acfaf80094c0fe..6efaebe179b9c9 100644 --- a/Parser/parser.c +++ b/Parser/parser.c @@ -2,10 +2,9 @@ #include "pegen.h" #if defined(Py_DEBUG) && defined(Py_BUILD_CORE) -extern int Py_DebugFlag; -#define D(x) if (Py_DebugFlag) x; +# define D(x) if (Py_DebugFlag) x; #else -#define D(x) +# define D(x) #endif static const int n_keyword_lists = 9; static KeywordToken *reserved_keywords[] = {