From 9d865c96506da85fd4b5622ad26491918c7c529e Mon Sep 17 00:00:00 2001
From: Amaury Forgeot d'Arc <amauryfa@gmail.com>
Date: Thu, 12 Jun 2008 22:27:27 +0000
Subject: [PATCH] On Windows, repair compilation of builtin modules _stringio
 and _pickle.

(Alexandre, the MSVC build files are in PCBuild.
the PC/Vxxx directories try to support older compilers)
---
 PC/VC6/pythoncore.dsp      | 8 ++++++++
 PC/VS7.1/pythoncore.vcproj | 6 ++++++
 PC/VS8.0/pythoncore.vcproj | 8 ++++++++
 PC/config.c                | 3 +++
 PCbuild/pythoncore.vcproj  | 8 ++++++++
 5 files changed, 33 insertions(+)

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 89ab515e0df..fde4be309ad 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -161,6 +161,10 @@ SOURCE=..\..\Modules\_lsprof.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_pickle.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_randommodule.c
 # End Source File
 # Begin Source File
@@ -169,6 +173,10 @@ SOURCE=..\..\Modules\_sre.c
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\Modules\_stringio.c
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\Modules\_struct.c
 # End Source File
 # Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index f02c2a2b69f..30947556fc0 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -388,12 +388,18 @@
 		<File
 			RelativePath="..\..\Modules\_lsprof.c">
 		</File>
+		<File
+			RelativePath="..\..\Modules\_pickle.c">
+		</File>
 		<File
 			RelativePath="..\..\Modules\_randommodule.c">
 		</File>
 		<File
 			RelativePath="..\..\Modules\_sre.c">
 		</File>
+		<File
+			RelativePath="..\..\Modules\_stringio.c">
+		</File>
 		<File
 			RelativePath="..\..\Modules\_struct.c">
 		</File>
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index af004f4c1fe..8c61e882824 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1010,6 +1010,10 @@
 				RelativePath="..\..\Modules\_lsprof.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\Modules\_pickle.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Modules\_randommodule.c"
 				>
@@ -1018,6 +1022,10 @@
 				RelativePath="..\..\Modules\_sre.c"
 				>
 			</File>
+			<File
+				RelativePath="..\..\Modules\_stringio.c"
+				>
+			</File>
 			<File
 				RelativePath="..\..\Modules\_struct.c"
 				>
diff --git a/PC/config.c b/PC/config.c
index a7f2ede9d49..f2bdfdb4b6e 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -60,6 +60,8 @@ extern PyObject* PyInit__lsprof(void);
 extern PyObject* PyInit__ast(void);
 extern PyObject* PyInit__fileio(void);
 extern PyObject* PyInit__bytesio(void);
+extern PyObject* PyInit__stringio(void);
+extern PyObject* PyInit__pickle(void);
 extern PyObject* PyInit_atexit(void);
 extern PyObject* _PyWarnings_Init(void);
 
@@ -151,6 +153,7 @@ struct _inittab _PyImport_Inittab[] = {
         {"_fileio", PyInit__fileio},
         {"_bytesio", PyInit__bytesio},
         {"_stringio", PyInit__stringio},
+        {"_pickle", PyInit__pickle},
         {"atexit", PyInit_atexit},
 
         /* Sentinel */
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index ca33a974326..33bea7e8121 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1014,6 +1014,10 @@
 				RelativePath="..\Modules\_lsprof.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Modules\_pickle.c"
+				>
+			</File>
 			<File
 				RelativePath="..\Modules\_randommodule.c"
 				>
@@ -1022,6 +1026,10 @@
 				RelativePath="..\Modules\_sre.c"
 				>
 			</File>
+			<File
+				RelativePath="..\Modules\_stringio.c"
+				>
+			</File>
 			<File
 				RelativePath="..\Modules\_struct.c"
 				>