[Python-checkins] r78224 - in python/branches/release26-maint: Misc/NEWS PC/msvcrtmodule.c PCbuild/pyproject.vsprops

[martin.v.loewis]

Author: martin.v.loewis
Date: Thu Feb 18 17:24:56 2010
New Revision: 78224

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


Modified:
   python/branches/release26-maint/   (props changed)
   python/branches/release26-maint/Misc/NEWS
   python/branches/release26-maint/PC/msvcrtmodule.c
   python/branches/release26-maint/PCbuild/pyproject.vsprops

Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS	(original)
+++ python/branches/release26-maint/Misc/NEWS	Thu Feb 18 17:24:56 2010
@@ -206,6 +206,9 @@
 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.
 

Modified: python/branches/release26-maint/PC/msvcrtmodule.c
==============================================================================
--- python/branches/release26-maint/PC/msvcrtmodule.c	(original)
+++ python/branches/release26-maint/PC/msvcrtmodule.c	Thu Feb 18 17:24:56 2010
@@ -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

Modified: python/branches/release26-maint/PCbuild/pyproject.vsprops
==============================================================================
--- python/branches/release26-maint/PCbuild/pyproject.vsprops	(original)
+++ python/branches/release26-maint/PCbuild/pyproject.vsprops	Thu Feb 18 17:24:56 2010
@@ -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"
 	/>