- Issue #22381: Update zlib to 1.2.8.

  Update zlib file names for the PC installers

diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
index 4c3cd989e6f163027df1a6476aab76f67c517150..e96336cb1ba41d21bc89cd7efd4596b4e042e113 100644 (file)
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -458,7 +458,19 @@ SOURCE=..\..\Parser\grammar1.c
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=..\..\Modules\zlib\gzio.c\r
+SOURCE=..\..\Modules\zlib\gzclose.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\zlib\gzlib.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\zlib\gzread.c\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=..\..\Modules\zlib\gzwrite.c\r
 # End Source File\r
 # Begin Source File\r
 \r

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 230d2ef52c5f37e0b86393aa6759ecd7673189ac..817b0c0789ce6824d19c398338d508665264d615 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -289,7 +289,16 @@
                                RelativePath="..\..\Modules\zlib\deflate.c">\r
                        </File>\r
                        <File\r
-                               RelativePath="..\..\Modules\zlib\gzio.c">\r
+                               RelativePath="..\..\Modules\zlib\gzclose.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\zlib\gzlib.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\zlib\gzread.c">\r
+                       </File>\r
+                       <File\r
+                               RelativePath="..\..\Modules\zlib\gzwrite.c">\r
                        </File>\r
                        <File\r
                                RelativePath="..\..\Modules\zlib\infback.c">\r

diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
index c8232264b09ed91c796aa85340a8c880d8c77d52..081d4f9e776f0fb50bb1f275b288b705772da2b7 100644 (file)
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1218,7 +1218,19 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\..\Modules\zlib\gzio.c"\r
+                                       RelativePath="..\..\Modules\zlib\gzclose.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\gzlib.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\gzread.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\..\Modules\zlib\gzwrite.c"\r
                                        >\r
                                </File>\r
                                <File\r

diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 76528dcd6465e8d30c500808a7e343aaba335249..5266d22875ea5c2236c1e55ffae8528bca49fdd0 100644 (file)
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1218,7 +1218,19 @@
                                        >\r
                                </File>\r
                                <File\r
-                                       RelativePath="..\Modules\zlib\gzio.c"\r
+                                       RelativePath="..\Modules\zlib\gzclose.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Modules\zlib\gzlib.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Modules\zlib\gzread.c"\r
+                                       >\r
+                               </File>\r
+                               <File\r
+                                       RelativePath="..\Modules\zlib\gzwrite.c"\r
                                        >\r
                                </File>\r
                                <File\r
@@ -1874,4 +1886,4 @@
        </Files>\r
        <Globals>\r
        </Globals>\r
-</VisualStudioProject>\r
\ No newline at end of file
+</VisualStudioProject>\r\r