diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-02-18 16:29:17 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-02-18 16:29:17 (GMT) |
| commit | 31e8af9ea5f1d9d696c8efea40fc774a37dfc776 (patch) | |
| tree | 1a40e00f87807436eb17946604e0a5dfccb34ecf | |
| parent | 9b3bada79f8a8d7ce8a8de4f1bd6a265a7851526 (diff) | |
| download | cpython-31e8af9ea5f1d9d696c8efea40fc774a37dfc776.zip cpython-31e8af9ea5f1d9d696c8efea40fc774a37dfc776.tar.gz cpython-31e8af9ea5f1d9d696c8efea40fc774a37dfc776.tar.bz2 | |
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.
........
................
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rwxr-xr-x | PC/msvcrtmodule.c | 2 |
2 files changed, 4 insertions, 1 deletions
@@ -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 48e739f..6c43278 100755 --- 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 |