bpo-35177, Python-ast.h: Fix "Yield" compiler warning (GH-10664)

Partially revert commit 5f2df88b63e50d23914e97ec778861a52abdeaad:
add "#undef Yield" to .c files after including Python-ast.h.

Fix the warning:

    winbase.h(102): warning C4005: 'Yield': macro redefinition

diff --git a/Include/Python-ast.h b/Include/Python-ast.h
index 1b7d9b10b1a567c7e6a4c9b1c711def67b630db8..1a2b8297810c84851e197b31db877d4de648a8dc 100644 (file)
--- a/Include/Python-ast.h
+++ b/Include/Python-ast.h
@@ -8,7 +8,7 @@ extern "C" {
 
 #include "asdl.h"
 
-#undef Yield /* undefine macro conflicting with winbase.h */
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
 
 typedef struct _mod *mod_ty;
 

diff --git a/Modules/parsermodule.c b/Modules/parsermodule.c
index df239d67b2f72ca9547fdd461335fcd4bcdbba8d..c8fb3d21771b0b0f62c34599837db98ab8728575 100644 (file)
--- a/Modules/parsermodule.c
+++ b/Modules/parsermodule.c
@@ -32,6 +32,7 @@
 
 #include "Python.h"                     /* general Python API             */
 #include "Python-ast.h"                 /* mod_ty */
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
 #include "ast.h"
 #include "graminit.h"                   /* symbols defined in the grammar */
 #include "node.h"                       /* internal parser structure      */

diff --git a/Parser/asdl_c.py b/Parser/asdl_c.py
index 6a8262c73b31d2799a4a6e5fde11af5a80eb0708..75fb78b9c94e15dc928e10617fe86f5032ca8133 100644 (file)
--- a/Parser/asdl_c.py
+++ b/Parser/asdl_c.py
@@ -1247,7 +1247,7 @@ def main(srcfile, dump_module=False):
             f.write('\n')
             f.write('#include "asdl.h"\n')
             f.write('\n')
-            f.write('#undef Yield /* undefine macro conflicting with winbase.h */\n')
+            f.write('#undef Yield   /* undefine macro conflicting with <winbase.h> */\n')
             f.write('\n')
             c = ChainOfVisitors(TypeDefVisitor(f),
                                 StructVisitor(f),

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 14550fd233f4ff8a20f571c9be7303210faca7f1..f0d342ae92d2296ec7f1394cf33239e0be58fa5b 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -3,6 +3,7 @@
 #include "Python.h"
 #include <ctype.h>
 #include "ast.h"
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
 #include "pycore_pystate.h"
 
 _Py_IDENTIFIER(__builtins__);

diff --git a/Python/import.c b/Python/import.c
index f7c37aa353c8c3b40cb9bd2b374381f2aa6d52ae..15637c6a1f31d14952d3deb6804f143ef9d8170a 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -3,6 +3,7 @@
 #include "Python.h"
 
 #include "Python-ast.h"
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
 #include "pycore_pyhash.h"
 #include "pycore_pylifecycle.h"
 #include "pycore_pymem.h"

diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c
index 58e16473100e3a65e4225922cb3c782916517c21..af3d5ef055faec849dacfcef220ee5646e5f52fa 100644 (file)
--- a/Python/pylifecycle.c
+++ b/Python/pylifecycle.c
@@ -3,6 +3,7 @@
 #include "Python.h"
 
 #include "Python-ast.h"
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
 #include "pycore_context.h"
 #include "pycore_hamt.h"
 #include "pycore_pathconfig.h"

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 1bf822ceadb483e2fdb30151b48de720b9ffa7cd..2d5dc88c5c7674be1a75885c0a7dfcffe81f1ee6 100644 (file)
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -11,6 +11,7 @@
 #include "Python.h"
 
 #include "Python-ast.h"
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
 #include "pycore_pystate.h"
 #include "grammar.h"
 #include "node.h"

diff --git a/Python/symtable.c b/Python/symtable.c
index 96f7bcda5e2665987a1188c69ee8820988bcd69e..677b6043438ea72889ec9e33cf1d1f028619decb 100644 (file)
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -1,6 +1,7 @@
 #include "Python.h"
 #include "pycore_pystate.h"
 #include "symtable.h"
+#undef Yield   /* undefine macro conflicting with <winbase.h> */
 #include "structmember.h"
 
 /* error strings used for warnings */