[Python-checkins] cpython (2.7): - Issue #22381: Update zlib to 1.2.8.

matthias.klose python-checkins at python.org
Thu Sep 11 09:09:17 CEST 2014


http://hg.python.org/cpython/rev/769126143656
changeset:   92393:769126143656
branch:      2.7
user:        doko at ubuntu.com
date:        Thu Sep 11 09:08:52 2014 +0200
summary:
  - Issue #22381: Update zlib to 1.2.8.

  Update zlib file names for the PC installers

files:
  PC/VC6/pythoncore.dsp      |  14 +++++++++++++-
  PC/VS7.1/pythoncore.vcproj |  11 ++++++++++-
  PC/VS8.0/pythoncore.vcproj |  14 +++++++++++++-
  PCbuild/pythoncore.vcproj  |  16 ++++++++++++++--
  4 files changed, 50 insertions(+), 5 deletions(-)


diff --git a/PC/VC6/pythoncore.dsp b/PC/VC6/pythoncore.dsp
--- a/PC/VC6/pythoncore.dsp
+++ b/PC/VC6/pythoncore.dsp
@@ -458,7 +458,19 @@
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\Modules\zlib\gzio.c
+SOURCE=..\..\Modules\zlib\gzclose.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\zlib\gzlib.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\zlib\gzread.c
+# End Source File
+# Begin Source File
+
+SOURCE=..\..\Modules\zlib\gzwrite.c
 # End Source File
 # Begin Source File
 
diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -289,7 +289,16 @@
 				RelativePath="..\..\Modules\zlib\deflate.c">
 			</File>
 			<File
-				RelativePath="..\..\Modules\zlib\gzio.c">
+				RelativePath="..\..\Modules\zlib\gzclose.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\zlib\gzlib.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\zlib\gzread.c">
+			</File>
+			<File
+				RelativePath="..\..\Modules\zlib\gzwrite.c">
 			</File>
 			<File
 				RelativePath="..\..\Modules\zlib\infback.c">
diff --git a/PC/VS8.0/pythoncore.vcproj b/PC/VS8.0/pythoncore.vcproj
--- a/PC/VS8.0/pythoncore.vcproj
+++ b/PC/VS8.0/pythoncore.vcproj
@@ -1218,7 +1218,19 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\Modules\zlib\gzio.c"
+					RelativePath="..\..\Modules\zlib\gzclose.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\zlib\gzlib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\zlib\gzread.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\Modules\zlib\gzwrite.c"
 					>
 				</File>
 				<File
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -1218,7 +1218,19 @@
 					>
 				</File>
 				<File
-					RelativePath="..\Modules\zlib\gzio.c"
+					RelativePath="..\Modules\zlib\gzclose.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\zlib\gzlib.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\zlib\gzread.c"
+					>
+				</File>
+				<File
+					RelativePath="..\Modules\zlib\gzwrite.c"
 					>
 				</File>
 				<File
@@ -1874,4 +1886,4 @@
 	</Files>
 	<Globals>
 	</Globals>
-</VisualStudioProject>
\ No newline at end of file
+</VisualStudioProject>


-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list