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 1ec726dbf47d6cb4fc92d0fce16f20015d60ab81..d9e91fbfca6d750e104bd3e95e128e38566b0dbf 100644 (file)
--- 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 48e739f2b768c603819dc0edfaef73031dc9b16d..6c43278f13cd20ba26e6c8da6623a3d9e183395c 100755 (executable)
--- 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