summaryrefslogtreecommitdiffstats
path: root/PC
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2010-02-18 16:27:43 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2010-02-18 16:27:43 (GMT)
commit3afc62e54f7081e81b365fe67f20bec6bf96cae8 (patch)
tree516407d709158e663d63c9d2d3287168c3d149ec /PC
parent5d233fd6ff73977fadc50280f44c92c26914f24a (diff)
downloadcpython-3afc62e54f7081e81b365fe67f20bec6bf96cae8.zip
cpython-3afc62e54f7081e81b365fe67f20bec6bf96cae8.tar.gz
cpython-3afc62e54f7081e81b365fe67f20bec6bf96cae8.tar.bz2
Merged revisions 78213 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r78213 | martin.v.loewis | 2010-02-18 10:22:20 +0100 (Do, 18 Feb 2010) | 3 lines Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as msvcr100.dll is not a platform assembly anymore. ........
Diffstat (limited to 'PC')
-rwxr-xr-xPC/msvcrtmodule.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c
index 48e739f..6c43278 100755
--- a/PC/msvcrtmodule.c
+++ b/PC/msvcrtmodule.c
@@ -25,7 +25,7 @@
#include <windows.h>
#ifdef _MSC_VER
-#if _MSC_VER >= 1500
+#if _MSC_VER >= 1500 && _MSC_VER < 1600
#include <crtassem.h>
#endif
#endif