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

diff --git a/Misc/NEWS b/Misc/NEWS
index 0778518325078f84d3dd41045c2a738850de492e..9c9c387c0217ab7ffe01dbae005ddbba96d0bc83 100644 (file)
--- 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 cad22b19e0a0d3ae31b0a9be851ad6c0d8395bce..4fe4eb4c2686be8ea06a9417812c1eb2170fa946 100755 (executable)
--- 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 0f3568adb056bc7b1e003b0d6978350f22eca228..fe90bd06036486b28c77628d8d58208c41191f3e 100644 (file)
--- a/PCbuild/pyproject.vsprops
+++ b/PCbuild/pyproject.vsprops
@@ -48,6 +48,14 @@
                Name="externalsDir"
                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)"
@@ -64,14 +72,6 @@
                Name="bsddb44DepLibs"
                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"