commit 00b0a9e5b2aac53db0c8c12e90b5537cd648043f
author Kristján Valur Jónsson <kristjan@ccpgames.com> Wed May 02 16:02:48 2007 +0000
committer Kristján Valur Jónsson <kristjan@ccpgames.com> Wed May 02 16:02:48 2007 +0000
tree efc97268836fb01ee3666ccca544a2516a94a1eb
parent 55d53f0367fb4294e326a43de94334b567ae3e27

Undefine the Yield macro after including Python_ast.h where it may cause conflicts with winbase.h on Windows.

Python/import.c

diff --git a/Python/import.c b/Python/import.c
index 291e63d..b35dea1 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -4,6 +4,8 @@
 #include "Python.h"
 
 #include "Python-ast.h"
+#undef Yield /* to avoid conflict with winbase.h */
+
 #include "pyarena.h"
 #include "pythonrun.h"
 #include "errcode.h"

Python/pythonrun.c

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 75241fe..d434d50 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -4,6 +4,8 @@
 #include "Python.h"
 
 #include "Python-ast.h"
+#undef Yield /* to avoid conflict with winbase.h */
+
 #include "grammar.h"
 #include "node.h"
 #include "token.h"