From 3afc62e54f7081e81b365fe67f20bec6bf96cae8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 18 Feb 2010 16:27:43 +0000 Subject: 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. ........ --- Misc/NEWS | 3 +++ PC/msvcrtmodule.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Misc/NEWS b/Misc/NEWS index ab83413..6d27dee 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -659,6 +659,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 #6508: Add posix.{getresuid,getresgid,setresuid,setresgid}. - Issue #7078: Set struct.__doc__ from _struct.__doc__. 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 #ifdef _MSC_VER -#if _MSC_VER >= 1500 +#if _MSC_VER >= 1500 && _MSC_VER < 1600 #include #endif #endif -- cgit v0.12