summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Heller <theller@ctypes.org>2008-06-10 15:01:24 (GMT)
committerThomas Heller <theller@ctypes.org>2008-06-10 15:01:24 (GMT)
commit12f8a0538b7e0964d82ddda86c63df97129f0c99 (patch)
treee66e62eb613dab26e3a2794a7a8e126ab5636b76
parent97cf99fc7e8c56868711f7c91c3b1e37e4c66cba (diff)
downloadcpython-12f8a0538b7e0964d82ddda86c63df97129f0c99.zip
cpython-12f8a0538b7e0964d82ddda86c63df97129f0c99.tar.gz
cpython-12f8a0538b7e0964d82ddda86c63df97129f0c99.tar.bz2
Fix the Windows build by removing references to the cStringIO module
which no longer exists.
-rw-r--r--PC/VC6/pythoncore.dsp4
-rw-r--r--PC/VS7.1/pythoncore.vcproj3
-rw-r--r--PC/VS8.0/pythoncore.vcproj12
-rw-r--r--PC/config.c2
-rw-r--r--PC/os2emx/Makefile1
-rw-r--r--PCbuild/pythoncore.vcproj4
6 files changed, 4 insertions, 22 deletions
diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 035a11d..e919620 100644
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -293,10 +293,6 @@ SOURCE=..\..\Modules\zlib\crc32.c
# End Source File
# Begin Source File
-SOURCE=..\..\Modules\cStringIO.c
-# End Source File
-# Begin Source File
-
SOURCE=..\..\Modules\datetimemodule.c
# End Source File
# Begin Source File
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 8692e7a..4865e11 100644
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -479,9 +479,6 @@
RelativePath="..\..\PC\config.c">
</File>
<File
- RelativePath="..\..\Modules\cStringIO.c">
- </File>
- <File
RelativePath="..\..\Modules\datetimemodule.c">
</File>
<File
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index c2eb356..2d34d12 100644
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -990,10 +990,10 @@
RelativePath="..\..\Modules\_fileio.c"
>
</File>
- <File^M
- RelativePath="..\..\Modules\_bytesio.c"^M
- >^M
- </File>^M
+ <File^M
+ RelativePath="..\..\Modules\_bytesio.c"^M
+ >^M
+ </File>^M
<File
RelativePath="..\..\Modules\_functoolsmodule.c"
>
@@ -1051,10 +1051,6 @@
>
</File>
<File
- RelativePath="..\..\Modules\cStringIO.c"
- >
- </File>
- <File
RelativePath="..\..\Modules\datetimemodule.c"
>
</File>
diff --git a/PC/config.c b/PC/config.c
index 23dbc645..4269aa5 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -23,7 +23,6 @@ extern void init_sha256(void);
extern void init_sha512(void);
extern void inittime(void);
extern void init_thread(void);
-extern void initcStringIO(void);
#ifdef WIN32
extern void initmsvcrt(void);
extern void init_locale(void);
@@ -95,7 +94,6 @@ struct _inittab _PyImport_Inittab[] = {
#ifdef WITH_THREAD
{"_thread", init_thread},
#endif
- {"cStringIO", initcStringIO},
#ifdef WIN32
{"msvcrt", initmsvcrt},
{"_locale", init_locale},
diff --git a/PC/os2emx/Makefile b/PC/os2emx/Makefile
index 10cadf9..8b4c404 100644
--- a/PC/os2emx/Makefile
+++ b/PC/os2emx/Makefile
@@ -287,7 +287,6 @@ SRC.MODULES= $(addprefix $(TOP), \
Modules/cmathmodule.c \
Modules/_codecsmodule.c \
Modules/collectionsmodule.c \
- Modules/cStringIO.c \
Modules/_csv.c \
Modules/datetimemodule.c \
Modules/errnomodule.c \
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 5cb0e35..d877115 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1055,10 +1055,6 @@
>
</File>
<File
- RelativePath="..\Modules\cStringIO.c"
- >
- </File>
- <File
RelativePath="..\Modules\datetimemodule.c"
>
</File>