From: Martin v. Löwis Date: Thu, 18 Feb 2010 16:29:17 +0000 (+0000) Subject: Merged revisions 78225 via svnmerge from X-Git-Tag: v3.1.2rc1~77 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=31e8af9ea5f1d9d696c8efea40fc774a37dfc776;p=python Merged revisions 78225 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r78225 | martin.v.loewis | 2010-02-18 17:27:43 +0100 (Do, 18 Feb 2010) | 11 lines 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. ........ ................ --- diff --git a/Misc/NEWS b/Misc/NEWS index 1ec726dbf4..d9e91fbfca 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -298,6 +298,9 @@ Library Extension Modules ----------------- +- Stop providing crtassem.h symbols when compiling with Visual Studio 2010, as + msvcr100.dll is not a platform assembly anymore. + - Issue #7078: Set struct.__doc__ from _struct.__doc__. - Issue #6848: Fix curses module build failure on OS X 10.6. diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index 48e739f2b7..6c43278f13 100755 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -25,7 +25,7 @@ #include #ifdef _MSC_VER -#if _MSC_VER >= 1500 +#if _MSC_VER >= 1500 && _MSC_VER < 1600 #include #endif #endif