Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

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.
  ........
................
This commit is contained in:
Martin v. Löwis 2010-02-18 16:29:17 +00:00
parent 9b3bada79f
commit 31e8af9ea5
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -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.

2
PC/msvcrtmodule.c
View File

@ -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