summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorKristján Valur Jónsson <kristjan@ccpgames.com>2007-04-25 00:17:39 (GMT)
committerKristján Valur Jónsson <kristjan@ccpgames.com>2007-04-25 00:17:39 (GMT)
commit67387fb4aadbbe1dbb498398b0786ca01d92552e (patch)
treec300a2253ea35fcd0973a9e8a668481ab956dfeb /Python
parent17b8e97e2e2c24322d45c33308212e0d6c32d934 (diff)
downloadcpython-67387fb4aadbbe1dbb498398b0786ca01d92552e.zip
cpython-67387fb4aadbbe1dbb498398b0786ca01d92552e.tar.gz
cpython-67387fb4aadbbe1dbb498398b0786ca01d92552e.tar.bz2
Make pythoncore compile cleanly with VisualStudio 2005. Used an explicit typecast to get a 64 bit integer, and undefined the Yield macro that conflicts with winbase.h
Diffstat (limited to 'Python')
-rw-r--r--Python/import.c1
-rw-r--r--Python/pythonrun.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/Python/import.c b/Python/import.c
index 9151762..383b6b2 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -4,6 +4,7 @@
#include "Python.h"
#include "Python-ast.h"
+#undef Yield /* undefine macro conflicting with winbase.h */
#include "pyarena.h"
#include "pythonrun.h"
#include "errcode.h"
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 3e5ecfe..96602ff 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -4,6 +4,7 @@
#include "Python.h"
#include "Python-ast.h"
+#undef Yield /* undefine macro conflicting with winbase.h */
#include "grammar.h"
#include "node.h"
#include "token.h"