From 7f898e3dc5584b726dc902b1a1b6946b1b0b4908 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= Date: Thu, 18 Feb 2010 16:24:56 +0000 Subject: [PATCH] Merged revisions 78213,78215 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. ........ r78215 | martin.v.loewis | 2010-02-18 13:45:45 +0100 (Do, 18 Feb 2010) | 1 line Move bsddb47 macros before their use, to make VS 2010 happy. ........ --- Misc/NEWS | 3 +++ PC/msvcrtmodule.c | 2 +- PCbuild/pyproject.vsprops | 16 ++++++++-------- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 07785183250..9c9c387c021 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -206,6 +206,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 #6877: Make it possible to link the readline extension to libedit on OSX. diff --git a/PC/msvcrtmodule.c b/PC/msvcrtmodule.c index cad22b19e0a..4fe4eb4c268 100755 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -23,7 +23,7 @@ #include #ifdef _MSC_VER -#if _MSC_VER >= 1500 +#if _MSC_VER >= 1500 && _MSC_VER < 1600 #include #endif #endif diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 0f3568adb05..fe90bd06036 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -48,6 +48,14 @@ Name="externalsDir" Value="..\.." /> + + - -