diff options
| author | Victor Stinner <vstinner@redhat.com> | 2018-11-22 17:38:38 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-22 17:38:38 (GMT) |
| commit | 3bb183d7fb83ad6a84ec13dea90f95d67be35c69 (patch) | |
| tree | 452e2804dc376a4bc6f4c80e660278dd9fbea1a1 /Python | |
| parent | 2cf5d32fd9e61488e8b0be55a2e92a752ba8b06b (diff) | |
| download | cpython-3bb183d7fb83ad6a84ec13dea90f95d67be35c69.zip cpython-3bb183d7fb83ad6a84ec13dea90f95d67be35c69.tar.gz cpython-3bb183d7fb83ad6a84ec13dea90f95d67be35c69.tar.bz2 | |
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
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/bltinmodule.c | 1 | ||||
| -rw-r--r-- | Python/import.c | 1 | ||||
| -rw-r--r-- | Python/pylifecycle.c | 1 | ||||
| -rw-r--r-- | Python/pythonrun.c | 1 | ||||
| -rw-r--r-- | Python/symtable.c | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c index 14550fd..f0d342a 100644 --- 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 f7c37aa..15637c6 100644 --- 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 58e1647..af3d5ef 100644 --- 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 1bf822c..2d5dc88 100644 --- 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 96f7bcd..677b604 100644 --- 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 */ |