From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Sun, 17 Feb 2008 20:56:31 +0000 (+0000)
Subject: Compilation was broken on Windows since the introduction of Advanced String Formatting.
X-Git-Tag: v2.6a1~142
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e7fa408741b482f30ed165d760330dbe626e71db;p=python

Compilation was broken on Windows since the introduction of Advanced String Formatting.

Only PCBuild (vs9) was really tested.
Changes for older compilers were done manually.
---

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index ca504d644a..0f4f9d2a52 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -125,6 +125,10 @@ SOURCE=..\..\Modules\_codecsmodule.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_collectionsmodule.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_csv.c
 # End Source File
 # Begin Source File
@@ -253,10 +257,6 @@ SOURCE=..\..\Objects\codeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\collectionsmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Python\compile.c
 # End Source File
 # Begin Source File
@@ -333,6 +333,14 @@ SOURCE=..\..\Objects\floatobject.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Python\formatter_string.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Python\formatter_unicode.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Objects\frameobject.c
 # End Source File
 # Begin Source File
@@ -583,10 +591,6 @@ SOURCE=..\..\Objects\rangeobject.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\rgbimgmodule.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\..\Modules\rotatingtree.c
 # End Source File
 # Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index bce0c614b5..a637ce2ea3 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -514,6 +514,12 @@
 		<File
 			RelativePath="..\..\Objects\floatobject.c">
 		</File>
+		<File
+			RelativePath="..\..\Python\formatter_string.c">
+		</File>
+		<File
+			RelativePath="..\..\Python\formatter_unicode.c">
+		</File>
 		<File
 			RelativePath="..\..\Objects\frameobject.c">
 		</File>
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index ff52b1e2ef..2bbfec485a 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1626,6 +1626,14 @@
 				RelativePath="..\..\Python\errors.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Python\formatter_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Python\frozen.c"
 				>
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 2a8101a7d0..39470748eb 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1626,6 +1626,14 @@
 				RelativePath="..\Python\errors.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Python\formatter_string.c"
+				>
+			</File>
+			<File
+				RelativePath="..\Python\formatter_unicode.c"
+				>
+			</File>
 			<File
 				RelativePath="..\Python\frozen.c"
 				>