From 12f8a0538b7e0964d82ddda86c63df97129f0c99 Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Tue, 10 Jun 2008 15:01:24 +0000 Subject: [PATCH] Fix the Windows build by removing references to the cStringIO module which no longer exists. --- PC/VC6/pythoncore.dsp | 4 ---- PC/VS7.1/pythoncore.vcproj | 3 --- PC/VS8.0/pythoncore.vcproj | 12 ++++-------- PC/config.c | 2 -- PC/os2emx/Makefile | 1 - PCbuild/pythoncore.vcproj | 4 ---- 6 files changed, 4 insertions(+), 22 deletions(-) diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp index 035a11da59..e919620000 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 8692e7a36c..4865e11a77 100644 --- a/PC/VS7.1/pythoncore.vcproj +++ b/PC/VS7.1/pythoncore.vcproj @@ -478,9 +478,6 @@ - - diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj index c2eb3561f7..2d34d12485 100644 --- a/PC/VS8.0/pythoncore.vcproj +++ b/PC/VS8.0/pythoncore.vcproj @@ -990,10 +990,10 @@ RelativePath="..\..\Modules\_fileio.c" > - ^M - ^M + ^M + ^M @@ -1050,10 +1050,6 @@ RelativePath="..\..\Modules\cmathmodule.c" > - - diff --git a/PC/config.c b/PC/config.c index 23dbc6453f..4269aa576b 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 10cadf950e..8b4c404f56 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 5cb0e35ba0..d8771159d0 100644 --- a/PCbuild/pythoncore.vcproj +++ b/PCbuild/pythoncore.vcproj @@ -1054,10 +1054,6 @@ RelativePath="..\Modules\cmathmodule.c" > - - -- 2.40.0