Be careful about Yield on Windows.

Author: ericsnowcurrently

Python/import.c

@@ -2,10 +2,10 @@
 /* Module definition and import implementation */
 
 #include "Python.h"
-#include "internal/pystate.h"
 
 #include "Python-ast.h"
 #undef Yield /* undefine macro conflicting with winbase.h */
+#include "internal/pystate.h"
 #include "errcode.h"
 #include "marshal.h"
 #include "code.h"

Python/pylifecycle.c

@@ -1,10 +1,10 @@
 /* Python interpreter top-level routines, including init/exit */
 
 #include "Python.h"
-#include "internal/pystate.h"
 
 #include "Python-ast.h"
 #undef Yield /* undefine macro conflicting with winbase.h */
+#include "internal/pystate.h"
 #include "grammar.h"
 #include "node.h"
 #include "token.h"

Python/pythonrun.c

@@ -9,10 +9,10 @@
 /* TODO: Cull includes following phase split */
 
 #include "Python.h"
-#include "internal/pystate.h"
 
 #include "Python-ast.h"
 #undef Yield /* undefine macro conflicting with winbase.h */
+#include "internal/pystate.h"
 #include "grammar.h"
 #include "node.h"
 #include "token.h"

Python/symtable.c

@@ -1,5 +1,8 @@
 #include "Python.h"
 #include "internal/pystate.h"
+#ifdef Yield
+#undef Yield /* undefine conflicting macro from winbase.h */
+#endif
 #include "Python-ast.h"
 #include "code.h"
 #include "symtable.h"