summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2006-05-23 19:34:37 (GMT)
committerTim Peters <tim.peters@gmail.com>2006-05-23 19:34:37 (GMT)
commitf178e5c1b75509c5f024ecb84a421b83718f35fe (patch)
tree31a500abb0ead142ffdd2d6d8ab783e1b23a0240
parent70bd199fa492a01be5d26cab905d5dfca3b2e245 (diff)
downloadcpython-f178e5c1b75509c5f024ecb84a421b83718f35fe.zip
cpython-f178e5c1b75509c5f024ecb84a421b83718f35fe.tar.gz
cpython-f178e5c1b75509c5f024ecb84a421b83718f35fe.tar.bz2
Get the Windows build working again (recover from
`struct` module changes).
-rw-r--r--PC/config.c4
-rw-r--r--PCbuild/pythoncore.vcproj6
2 files changed, 5 insertions, 5 deletions
diff --git a/PC/config.c b/PC/config.c
index 75e1a3c..be11d3f 100644
--- a/PC/config.c
+++ b/PC/config.c
@@ -28,7 +28,6 @@ extern void init_sha(void);
extern void init_sha256(void);
extern void init_sha512(void);
extern void initstrop(void);
-extern void initstruct(void);
extern void inittime(void);
extern void initthread(void);
extern void initcStringIO(void);
@@ -53,6 +52,7 @@ extern void init_csv(void);
extern void init_sre(void);
extern void initparser(void);
extern void init_winreg(void);
+extern void init_struct(void);
extern void initdatetime(void);
extern void initfunctional(void);
extern void initzlib(void);
@@ -102,7 +102,6 @@ struct _inittab _PyImport_Inittab[] = {
{"_sha256", init_sha256},
{"_sha512", init_sha512},
{"strop", initstrop},
- {"struct", initstruct},
{"time", inittime},
#ifdef WITH_THREAD
{"thread", initthread},
@@ -131,6 +130,7 @@ struct _inittab _PyImport_Inittab[] = {
{"_sre", init_sre},
{"parser", initparser},
{"_winreg", init_winreg},
+ {"_struct", init_struct},
{"datetime", initdatetime},
{"functional", initfunctional},
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 5f39a17..21e8d83 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -344,6 +344,9 @@
RelativePath="..\Modules\_bisectmodule.c">
</File>
<File
+ RelativePath="..\Modules\_struct.c">
+ </File>
+ <File
RelativePath="..\Modules\cjkcodecs\_codecs_cn.c">
</File>
<File
@@ -746,9 +749,6 @@
RelativePath="..\Python\structmember.c">
</File>
<File
- RelativePath="..\Modules\structmodule.c">
- </File>
- <File
RelativePath="..\Objects\structseq.c">
</File>
<File