summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-02-18 09:22:20 +0000
committerMartin v. Löwis <martin@v.loewis.de>2010-02-18 09:22:20 +0000
commit101efac5e5d97885737a64d0da540eb891ee43be (patch)
tree2d5458e009661fd4f40dbbfb8f4d3ec5d71c2c4a
parent2d942cce4d93f3c080f542fdcb8e95e9fe55b231 (diff)
downloadcpython-101efac5e5d97885737a64d0da540eb891ee43be.tar.gz
Stop providing crtassem.h symbols when compiling with
Visual Studio 2010, as msvcr100.dll is not a platform assembly anymore.
-rw-r--r--Misc/NEWS5
-rwxr-xr-xPC/msvcrtmodule.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 4441e9288b..fbcb23af66 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -25,6 +25,11 @@ Library
- Issue 7588: ``unittest.TextTestResult.getDescription`` now includes the test
name in failure reports even if the test has a docstring.
+Extension Modules
+-----------------
+
+- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as
+ msvcr100.dll is not a platform assembly anymore.
Tests
-----
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
index 6e804e454f..9764a02ab3 100755
--- a/PC/msvcrtmodule.c
+++ b/PC/msvcrtmodule.c
@@ -23,7 +23,7 @@
#include <sys/locking.h>
#ifdef _MSC_VER
-#if _MSC_VER >= 1500
+#if _MSC_VER >= 1500 && _MSC_VER < 1600
#include <crtassem.h>
#endif
#endif