diff options
| author | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-12 22:27:27 (GMT) |
|---|---|---|
| committer | Amaury Forgeot d'Arc <amauryfa@gmail.com> | 2008-06-12 22:27:27 (GMT) |
| commit | 9d865c96506da85fd4b5622ad26491918c7c529e (patch) | |
| tree | d70df8542d8f848033fb5774c0ef189a9037dbd0 | |
| parent | 9f0f960d4ce48062dcb286903721fa89d6037159 (diff) | |
| download | cpython-9d865c96506da85fd4b5622ad26491918c7c529e.zip cpython-9d865c96506da85fd4b5622ad26491918c7c529e.tar.gz cpython-9d865c96506da85fd4b5622ad26491918c7c529e.tar.bz2 | |
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)
| -rw-r--r-- | PC/VC6/pythoncore.dsp | 8 | ||||
| -rw-r--r-- | PC/VS7.1/pythoncore.vcproj | 6 | ||||
| -rw-r--r-- | PC/VS8.0/pythoncore.vcproj | 8 | ||||
| -rw-r--r-- | PC/config.c | 3 | ||||
| -rw-r--r-- | PCbuild/pythoncore.vcproj | 8 |
5 files changed, 33 insertions, 0 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 89ab515..fde4be3 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 f02c2a2..3094755 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -389,12 +389,18 @@ 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> <File diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index af004f4..8c61e88 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -1011,6 +1011,10 @@ >
</File>
<File
+ RelativePath="..\..\Modules\_pickle.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Modules\_randommodule.c"
>
</File>
@@ -1019,6 +1023,10 @@ >
</File>
<File
+ RelativePath="..\..\Modules\_stringio.c"
+ >
+ </File>
+ <File
RelativePath="..\..\Modules\_struct.c"
>
</File>
diff --git a/PC/config.c b/PC/config.c index a7f2ede..f2bdfdb 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 ca33a97..33bea7e 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -1015,6 +1015,10 @@ > </File> <File + RelativePath="..\Modules\_pickle.c" + > + </File> + <File RelativePath="..\Modules\_randommodule.c" > </File> @@ -1023,6 +1027,10 @@ > </File> <File + RelativePath="..\Modules\_stringio.c" + > + </File> + <File RelativePath="..\Modules\_struct.c" > </File> |