From: Kristján Valur Jónsson <kristjan@ccpgames.com>
Date: Wed, 2 May 2007 16:02:48 +0000 (+0000)
Subject: Undefine the Yield macro after including Python_ast.h where it may cause conflicts... 
X-Git-Tag: v2.5.2c1~320
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=00b0a9e5b2aac53db0c8c12e90b5537cd648043f;p=python

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

diff --git a/Python/import.c b/Python/import.c
index 291e63dc79..b35dea1927 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"
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 75241fe915..d434d50b4f 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"