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

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

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

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"