[Python-checkins] r55073 - python/branches/release25-maint/Python/import.c python/branches/release25-maint/Python/pythonrun.c

Wed May 2 18:02:57 CEST 2007

Author: kristjan.jonsson
Date: Wed May 2 18:02:48 2007
New Revision: 55073
Modified:
 python/branches/release25-maint/Python/import.c
 python/branches/release25-maint/Python/pythonrun.c
Log:
Undefine the Yield macro after including Python_ast.h where it may cause conflicts with winbase.h on Windows.
Modified: python/branches/release25-maint/Python/import.c
==============================================================================

--- python/branches/release25-maint/Python/import.c	(original)
+++ python/branches/release25-maint/Python/import.c	Wed May 2 18:02:48 2007
@@ -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"
Modified: python/branches/release25-maint/Python/pythonrun.c
==============================================================================
--- python/branches/release25-maint/Python/pythonrun.c	(original)
+++ python/branches/release25-maint/Python/pythonrun.c	Wed May 2 18:02:48 2007
@@ -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"
