[Python-checkins] r78226 - in python/branches/release31-maint: Misc/NEWS PC/msvcrtmodule.c

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Feb 18 17:29:17 2010
New Revision: 78226

Log:
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.
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Misc/NEWS
   python/branches/release31-maint/PC/msvcrtmodule.c

Modified: python/branches/release31-maint/Misc/NEWS
==============================================================================
--- python/branches/release31-maint/Misc/NEWS	(original)
+++ python/branches/release31-maint/Misc/NEWS	Thu Feb 18 17:29:17 2010
@@ -298,6 +298,9 @@
 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.

Modified: python/branches/release31-maint/PC/msvcrtmodule.c
==============================================================================
--- python/branches/release31-maint/PC/msvcrtmodule.c	(original)
+++ python/branches/release31-maint/PC/msvcrtmodule.c	Thu Feb 18 17:29:17 2010
@@ -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