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)

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 89ab515e0dfc5cca80c241007c30b9871ad83553..fde4be309ad2e1da6ceb55e549f53a280472b2fb 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -161,6 +161,10 @@ SOURCE=..\..\Modules\_lsprof.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_pickle.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_randommodule.c\r
 # End Source File\r
 # Begin Source File\r
@@ -169,6 +173,10 @@ SOURCE=..\..\Modules\_sre.c
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=..\..\Modules\_stringio.c\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=..\..\Modules\_struct.c\r
 # End Source File\r
 # Begin Source File\r

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index f02c2a2b69f34b57e3e4d19950c3883ccadc250e..30947556fc06d147ba6d702214f72e89918be9ce 100644 (file)
--- 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 af004f4c1fe4a839c257d1c6a53f0fb582a37a54..8c61e88282403451eed6a6d663197cda866ec8d2 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1010,6 +1010,10 @@
                                RelativePath="..\..\Modules\_lsprof.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_pickle.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\_randommodule.c"\r
                                >\r
@@ -1018,6 +1022,10 @@
                                RelativePath="..\..\Modules\_sre.c"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\_stringio.c"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath="..\..\Modules\_struct.c"\r
                                >\r

diff --git a/PC/config.c b/PC/config.c
index a7f2ede9d492e4c7764ebec2af728bfe3396ae69..f2bdfdb4b6e5fd15d144f9a85b10edc957ba1f8d 100644 (file)
--- 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 ca33a97432680da384ec1a4550e528f0adae0fde..33bea7e81215a0d418486da901017f0cab7f17b8 100644 (file)
--- 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"
                                >