diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2010-02-18 16:24:56 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2010-02-18 16:24:56 (GMT) |
| commit | 7f898e3dc5584b726dc902b1a1b6946b1b0b4908 (patch) | |
| tree | ed3a296191ec87271d4d9c3aa8231d37eeabc9fb | |
| parent | af211c85afff4080fa5a650348d1bd21d9ae0e50 (diff) | |
| download | cpython-7f898e3dc5584b726dc902b1a1b6946b1b0b4908.zip cpython-7f898e3dc5584b726dc902b1a1b6946b1b0b4908.tar.gz cpython-7f898e3dc5584b726dc902b1a1b6946b1b0b4908.tar.bz2 | |
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.
........
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rwxr-xr-x | PC/msvcrtmodule.c | 2 | ||||
| -rw-r--r-- | PCbuild/pyproject.vsprops | 16 |
3 files changed, 12 insertions, 9 deletions
@@ -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 cad22b1..4fe4eb4 100755 --- a/PC/msvcrtmodule.c +++ b/PC/msvcrtmodule.c @@ -23,7 +23,7 @@ #include <sys/locking.h> #ifdef _MSC_VER -#if _MSC_VER >= 1500 +#if _MSC_VER >= 1500 && _MSC_VER < 1600 #include <crtassem.h> #endif #endif diff --git a/PCbuild/pyproject.vsprops b/PCbuild/pyproject.vsprops index 0f3568a..fe90bd0 100644 --- a/PCbuild/pyproject.vsprops +++ b/PCbuild/pyproject.vsprops @@ -49,6 +49,14 @@ Value="..\.." /> <UserMacro + Name="bsddb47Dir" + Value="$(externalsDir)\db-4.7.25.0\build_windows" + /> + <UserMacro + Name="bsddb47DepLibs" + Value="ws2_32.lib" + /> + <UserMacro Name="bsddbDir" Value="$(bsddb47Dir)" /> @@ -65,14 +73,6 @@ Value="" /> <UserMacro - Name="bsddb47Dir" - Value="$(externalsDir)\db-4.7.25.0\build_windows" - /> - <UserMacro - Name="bsddb47DepLibs" - Value="ws2_32.lib" - /> - <UserMacro Name="sqlite3Dir" Value="$(externalsDir)\sqlite-3.5.9" /> |