From: Tim Peters <tim.peters@gmail.com>
Date: Tue, 23 May 2006 19:34:37 +0000 (+0000)
Subject: Get the Windows build working again (recover from
X-Git-Tag: v2.5b1~564
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f178e5c1b75509c5f024ecb84a421b83718f35fe;p=python

Get the Windows build working again (recover from
`struct` module changes).
---

diff --git a/PC/config.c b/PC/config.c
index 75e1a3cb5e..be11d3f8dc 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 5f39a17037..21e8d83500 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -343,6 +343,9 @@
 		<File
 			RelativePath="..\Modules\_bisectmodule.c">
 		</File>
+		<File
+			RelativePath="..\Modules\_struct.c">
+		</File>
 		<File
 			RelativePath="..\Modules\cjkcodecs\_codecs_cn.c">
 		</File>
@@ -745,9 +748,6 @@
 		<File
 			RelativePath="..\Python\structmember.c">
 		</File>
-		<File
-			RelativePath="..\Modules\structmodule.c">
-		</File>
 		<File
 			RelativePath="..\Objects\structseq.c">
 		</File>