Stowage/cpython
2
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-31 21:51:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

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

Fix the warning:

    winbase.h(102): warning C4005: 'Yield': macro redefinition
This commit is contained in:
Victor Stinner 2018-11-22 18:38:38 +01:00 • committed by GitHub
parent 2cf5d32fd9
commit 3bb183d7fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Include/Python-ast.h generated
View file

@ -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;

1
Modules/parsermodule.c
View file

@ -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 */

2
Parser/asdl_c.py
View file

@ -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),

1
Python/bltinmodule.c
View file

@ -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__);

1
Python/import.c
View file

@ -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"

1
Python/pylifecycle.c
View file

@ -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"

1
Python/pythonrun.c
View file

@ -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"

1
Python/symtable.c
View file

@ -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 */