diff options
Diffstat (limited to 'Build')
-rw-r--r-- | Build/source/libs/zlib/ChangeLog | 7 | ||||
-rw-r--r-- | Build/source/libs/zlib/Makefile.in | 101 | ||||
-rw-r--r-- | Build/source/libs/zlib/aclocal.m4 | 288 | ||||
-rwxr-xr-x | Build/source/libs/zlib/configure | 254 | ||||
-rw-r--r-- | Build/source/libs/zlib/configure.ac | 19 | ||||
-rw-r--r-- | Build/source/libs/zlib/include/Makefile.in | 63 | ||||
-rw-r--r-- | Build/source/libs/zlib/version.ac | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj.user | 3 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj.user | 3 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj.user | 3 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj.user | 3 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj.user | 3 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj.user | 3 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.7/zlib.3.pdf | bin | 8760 -> 0 bytes | |||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8-PATCHES/ChangeLog (renamed from Build/source/libs/zlib/zlib-1.2.7-PATCHES/ChangeLog) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8-PATCHES/TL-Changes (renamed from Build/source/libs/zlib/zlib-1.2.7-PATCHES/TL-Changes) | 20 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/CMakeLists.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/CMakeLists.txt) | 52 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/ChangeLog (renamed from Build/source/libs/zlib/zlib-1.2.7/ChangeLog) | 63 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/FAQ (renamed from Build/source/libs/zlib/zlib-1.2.7/FAQ) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/INDEX (renamed from Build/source/libs/zlib/zlib-1.2.7/INDEX) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/Makefile (renamed from Build/source/libs/zlib/zlib-1.2.7/Makefile) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/Makefile.in (renamed from Build/source/libs/zlib/zlib-1.2.7/Makefile.in) | 20 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/README (renamed from Build/source/libs/zlib/zlib-1.2.7/README) | 6 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/adler32.c (renamed from Build/source/libs/zlib/zlib-1.2.7/adler32.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/amiga/Makefile.pup (renamed from Build/source/libs/zlib/zlib-1.2.7/amiga/Makefile.pup) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/amiga/Makefile.sas (renamed from Build/source/libs/zlib/zlib-1.2.7/amiga/Makefile.sas) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/as400/bndsrc (renamed from Build/source/libs/zlib/zlib-1.2.7/as400/bndsrc) | 10 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/as400/compile.clp (renamed from Build/source/libs/zlib/zlib-1.2.7/as400/compile.clp) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/as400/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/as400/readme.txt) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/as400/zlib.inc (renamed from Build/source/libs/zlib/zlib-1.2.7/as400/zlib.inc) | 14 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/compress.c (renamed from Build/source/libs/zlib/zlib-1.2.7/compress.c) | 2 | ||||
-rwxr-xr-x | Build/source/libs/zlib/zlib-1.2.8/configure (renamed from Build/source/libs/zlib/zlib-1.2.7/configure) | 171 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/README.contrib (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/README.contrib) | 1 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/buffer_demo.adb (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/buffer_demo.adb) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/mtest.adb (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/mtest.adb) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/read.adb (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/read.adb) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/readme.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/test.adb (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/test.adb) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-streams.adb (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-streams.adb) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-streams.ads (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-streams.ads) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-thin.adb (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-thin.adb) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-thin.ads (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-thin.ads) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.adb (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.adb) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.ads (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.ads) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.gpr (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.gpr) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/amd64/amd64-match.S (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/amd64/amd64-match.S) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/asm686/README.686 (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/asm686/README.686) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/asm686/match.S (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/asm686/match.S) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/blast/Makefile (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/blast/Makefile) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/blast/README (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/blast/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/blast/blast.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/blast/blast.c) | 8 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/blast/blast.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/blast/blast.h) | 8 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/blast/test.pk (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/blast/test.pk) | bin | 8 -> 8 bytes | |||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/blast/test.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/blast/test.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/ZLib.pas (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/ZLib.pas) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/ZLibConst.pas (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/ZLibConst.pas) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/readme.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/zlibd32.mak (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/zlibd32.mak) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.build (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.build) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.chm (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.chm) | bin | 72726 -> 72726 bytes | |||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.sln (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.sln) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/AssemblyInfo.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/AssemblyInfo.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/ChecksumImpl.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/ChecksumImpl.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/CircularBuffer.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/CircularBuffer.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/CodecBase.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/CodecBase.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/Deflater.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/Deflater.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/DotZLib.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.csproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/DotZLib.csproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/GZipStream.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/GZipStream.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/Inflater.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/Inflater.cs) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/UnitTests.cs (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/UnitTests.cs) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/LICENSE_1_0.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/LICENSE_1_0.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/readme.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/gcc_gvmat64/gvmat64.S (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/gcc_gvmat64/gvmat64.S) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/README (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/infback9.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/infback9.c) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/infback9.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/infback9.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inffix9.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inffix9.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inflate9.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inflate9.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inftree9.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inftree9.c) | 6 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inftree9.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inftree9.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/inflate86/inffas86.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/inflate86/inffas86.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/inflate86/inffast.S (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/inflate86/inffast.S) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/test.cpp (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/test.cpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/zfstream.cpp (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/zfstream.cpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/zfstream.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/zfstream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream2/zstream.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream2/zstream.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream2/zstream_test.cpp (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream2/zstream_test.cpp) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/README (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/TODO (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/TODO) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/test.cc (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/test.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/zfstream.cc (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/zfstream.cc) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/zfstream.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/zfstream.h) | 0 | ||||
-rwxr-xr-x | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/bld_ml64.bat (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/bld_ml64.bat) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/gvmat64.asm (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/gvmat64.asm) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/inffas8664.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/inffas8664.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/inffasx64.asm (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/inffasx64.asm) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/readme.txt) | 0 | ||||
-rwxr-xr-x | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/bld_ml32.bat (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/bld_ml32.bat) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/inffas32.asm (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/inffas32.asm) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/match686.asm (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/match686.asm) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/readme.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/Makefile (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/Makefile) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/Makefile.am (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/Makefile.am) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/MiniZip64_Changes.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/MiniZip64_Changes.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/MiniZip64_info.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/MiniZip64_info.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/configure.ac (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/configure.ac) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/crypt.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/crypt.h) | 8 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/ioapi.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/ioapi.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/ioapi.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/ioapi.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/iowin32.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/iowin32.c) | 98 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/iowin32.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/iowin32.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/make_vms.com (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/make_vms.com) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/miniunz.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/miniunz.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/minizip.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/minizip.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/minizip.pc.in (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/minizip.pc.in) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/mztools.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/mztools.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/mztools.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/mztools.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/unzip.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/unzip.c) | 12 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/unzip.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/unzip.h) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/zip.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/zip.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/zip.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/zip.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/example.pas (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/example.pas) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/readme.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/zlibd32.mak (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/zlibd32.mak) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/zlibpas.pas (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/zlibpas.pas) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/puff/Makefile (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/puff/Makefile) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/puff/README (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/puff/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/puff/puff.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/puff/puff.c) | 7 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/puff/puff.h (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/puff/puff.h) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/puff/pufftest.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/puff/pufftest.c) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/puff/zeros.raw (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/puff/zeros.raw) | bin | 2517 -> 2517 bytes | |||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/testzlib/testzlib.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/testzlib/testzlib.c) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/testzlib/testzlib.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/testzlib/testzlib.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/Makefile (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/Makefile) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/Makefile.msc (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/Makefile.msc) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/untgz.c (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/untgz.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/readme.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/readme.txt) | 7 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj.filters (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj.filters (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj.filters (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj.filters (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlib.rc (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlib.rc) | 10 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj) | 16 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj.filters (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.def (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.def) | 6 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.sln (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.sln) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj) | 30 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj.filters (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj.filters) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/miniunz.vcproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/miniunz.vcproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/minizip.vcproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/minizip.vcproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/testzlib.vcproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/testzlib.vcproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/testzlibdll.vcproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/testzlibdll.vcproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlib.rc (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlib.rc) | 10 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibstat.vcproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibstat.vcproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.def (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.def) | 6 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.sln (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.sln) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.vcproj (renamed from Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.vcproj) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/crc32.c (renamed from Build/source/libs/zlib/zlib-1.2.7/crc32.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/crc32.h (renamed from Build/source/libs/zlib/zlib-1.2.7/crc32.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/deflate.c (renamed from Build/source/libs/zlib/zlib-1.2.7/deflate.c) | 12 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/deflate.h (renamed from Build/source/libs/zlib/zlib-1.2.7/deflate.h) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/doc/algorithm.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/doc/algorithm.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/doc/txtvsbin.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/doc/txtvsbin.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/README.examples (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/README.examples) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/enough.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/enough.c) | 39 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/fitblk.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/fitblk.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/gun.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/gun.c) | 11 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/gzappend.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/gzappend.c) | 22 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/gzjoin.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/gzjoin.c) | 13 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/gzlog.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/gzlog.c) | 21 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/gzlog.h (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/gzlog.h) | 6 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/zlib_how.html (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/zlib_how.html) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/zpipe.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/zpipe.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/examples/zran.c (renamed from Build/source/libs/zlib/zlib-1.2.7/examples/zran.c) | 11 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/gzclose.c (renamed from Build/source/libs/zlib/zlib-1.2.7/gzclose.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/gzguts.h (renamed from Build/source/libs/zlib/zlib-1.2.7/gzguts.h) | 22 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/gzlib.c (renamed from Build/source/libs/zlib/zlib-1.2.7/gzlib.c) | 40 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/gzread.c (renamed from Build/source/libs/zlib/zlib-1.2.7/gzread.c) | 21 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/gzwrite.c (renamed from Build/source/libs/zlib/zlib-1.2.7/gzwrite.c) | 64 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/infback.c (renamed from Build/source/libs/zlib/zlib-1.2.7/infback.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/inffast.c (renamed from Build/source/libs/zlib/zlib-1.2.7/inffast.c) | 6 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/inffast.h (renamed from Build/source/libs/zlib/zlib-1.2.7/inffast.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/inffixed.h (renamed from Build/source/libs/zlib/zlib-1.2.7/inffixed.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/inflate.c (renamed from Build/source/libs/zlib/zlib-1.2.7/inflate.c) | 64 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/inflate.h (renamed from Build/source/libs/zlib/zlib-1.2.7/inflate.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/inftrees.c (renamed from Build/source/libs/zlib/zlib-1.2.7/inftrees.c) | 14 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/inftrees.h (renamed from Build/source/libs/zlib/zlib-1.2.7/inftrees.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/make_vms.com (renamed from Build/source/libs/zlib/zlib-1.2.7/make_vms.com) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.bor (renamed from Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.bor) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.dj2 (renamed from Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.dj2) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.emx (renamed from Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.emx) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.msc (renamed from Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.msc) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.tc (renamed from Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.tc) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/nintendods/Makefile (renamed from Build/source/libs/zlib/zlib-1.2.7/nintendods/Makefile) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/nintendods/README (renamed from Build/source/libs/zlib/zlib-1.2.7/nintendods/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/old/Makefile.emx (renamed from Build/source/libs/zlib/zlib-1.2.7/old/Makefile.emx) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/old/Makefile.riscos (renamed from Build/source/libs/zlib/zlib-1.2.7/old/Makefile.riscos) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/old/README (renamed from Build/source/libs/zlib/zlib-1.2.7/old/README) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/old/descrip.mms (renamed from Build/source/libs/zlib/zlib-1.2.7/old/descrip.mms) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/old/os2/Makefile.os2 (renamed from Build/source/libs/zlib/zlib-1.2.7/old/os2/Makefile.os2) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/old/os2/zlib.def (renamed from Build/source/libs/zlib/zlib-1.2.7/old/os2/zlib.def) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/old/visual-basic.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/old/visual-basic.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/qnx/package.qpg (renamed from Build/source/libs/zlib/zlib-1.2.7/qnx/package.qpg) | 10 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/test/example.c (renamed from Build/source/libs/zlib/zlib-1.2.7/test/example.c) | 8 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/test/infcover.c (renamed from Build/source/libs/zlib/zlib-1.2.7/test/infcover.c) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/test/minigzip.c (renamed from Build/source/libs/zlib/zlib-1.2.7/test/minigzip.c) | 20 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/treebuild.xml (renamed from Build/source/libs/zlib/zlib-1.2.7/treebuild.xml) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/trees.c (renamed from Build/source/libs/zlib/zlib-1.2.7/trees.c) | 14 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/trees.h (renamed from Build/source/libs/zlib/zlib-1.2.7/trees.h) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/uncompr.c (renamed from Build/source/libs/zlib/zlib-1.2.7/uncompr.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/watcom/watcom_f.mak (renamed from Build/source/libs/zlib/zlib-1.2.7/watcom/watcom_f.mak) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/watcom/watcom_l.mak (renamed from Build/source/libs/zlib/zlib-1.2.7/watcom/watcom_l.mak) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/DLL_FAQ.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/DLL_FAQ.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.bor (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.bor) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.gcc (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.gcc) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.msc (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.msc) | 77 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/README-WIN32.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/README-WIN32.txt) | 4 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/VisualC.txt (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/VisualC.txt) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/zlib.def (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/zlib.def) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/win32/zlib1.rc (renamed from Build/source/libs/zlib/zlib-1.2.7/win32/zlib1.rc) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zconf.h.cmakein (renamed from Build/source/libs/zlib/zlib-1.2.7/zconf.h.cmakein) | 33 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zconf.h.in (renamed from Build/source/libs/zlib/zlib-1.2.7/zconf.h.in) | 33 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zlib.3 (renamed from Build/source/libs/zlib/zlib-1.2.7/zlib.3) | 6 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zlib.3.pdf | bin | 0 -> 8734 bytes | |||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zlib.h (renamed from Build/source/libs/zlib/zlib-1.2.7/zlib.h) | 48 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zlib.map (renamed from Build/source/libs/zlib/zlib-1.2.7/zlib.map) | 5 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zlib.pc.cmakein (renamed from Build/source/libs/zlib/zlib-1.2.7/zlib.pc.cmakein) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zlib.pc.in (renamed from Build/source/libs/zlib/zlib-1.2.7/zlib.pc.in) | 0 | ||||
-rwxr-xr-x | Build/source/libs/zlib/zlib-1.2.8/zlib2ansi (renamed from Build/source/libs/zlib/zlib-1.2.7/zlib2ansi) | 0 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zutil.c (renamed from Build/source/libs/zlib/zlib-1.2.7/zutil.c) | 2 | ||||
-rw-r--r-- | Build/source/libs/zlib/zlib-1.2.8/zutil.h (renamed from Build/source/libs/zlib/zlib-1.2.7/zutil.h) | 9 |
236 files changed, 1407 insertions, 625 deletions
diff --git a/Build/source/libs/zlib/ChangeLog b/Build/source/libs/zlib/ChangeLog index 8f5005afa5a..45fd5261d52 100644 --- a/Build/source/libs/zlib/ChangeLog +++ b/Build/source/libs/zlib/ChangeLog @@ -1,3 +1,8 @@ +2012-05-18 Peter Breitenlohner <peb@mppmu.mpg.de> + + Import zlib-1.2.8. + * version.ac: Adapt. + 2013-01-29 Peter Breitenlohner <peb@mppmu.mpg.de> * Makefile.am: Allow subdir-objects. @@ -13,7 +18,7 @@ 2012-05-03 Peter Breitenlohner <peb@mppmu.mpg.de> Import zlib-1.2.7. - * version.ac: Adapt.. + * version.ac: Adapt. 2012-03-28 Karl Berry <karl@tug.org> diff --git a/Build/source/libs/zlib/Makefile.in b/Build/source/libs/zlib/Makefile.in index 51f96d47772..c54f792a981 100644 --- a/Build/source/libs/zlib/Makefile.in +++ b/Build/source/libs/zlib/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,23 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ esac; \ - test $$am__dry = yes; \ - } + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -55,14 +83,18 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(srcdir)/config.h.in $(am__dist_check_SCRIPTS_DIST) \ $(top_srcdir)/../../build-aux/depcomp \ $(top_srcdir)/../../build-aux/test-driver ChangeLog README \ - ../../build-aux/config.guess ../../build-aux/config.sub \ - ../../build-aux/depcomp ../../build-aux/install-sh \ - ../../build-aux/missing ../../build-aux/texinfo.tex \ - ../../build-aux/ylwrap ../../build-aux/ltmain.sh \ + ../../build-aux/compile ../../build-aux/config.guess \ + ../../build-aux/config.sub ../../build-aux/depcomp \ + ../../build-aux/install-sh ../../build-aux/missing \ + ../../build-aux/texinfo.tex ../../build-aux/ylwrap \ + ../../build-aux/ltmain.sh \ + $(top_srcdir)/../../build-aux/compile \ $(top_srcdir)/../../build-aux/install-sh \ $(top_srcdir)/../../build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ + $(top_srcdir)/../../m4/kpse-visibility.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \ $(top_srcdir)/configure.ac @@ -467,6 +499,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@ ZLIB_DEFINES = @ZLIB_DEFINES@ ZLIB_TREE = @ZLIB_TREE@ @@ -591,8 +624,8 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -643,6 +676,7 @@ clean-noinstLIBRARIES: @ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp) @ZLIB_TREE@/zutil.$(OBJEXT): @ZLIB_TREE@/$(am__dirstamp) \ @ZLIB_TREE@/$(DEPDIR)/$(am__dirstamp) + libz.a: $(libz_a_OBJECTS) $(libz_a_DEPENDENCIES) $(EXTRA_libz_a_DEPENDENCIES) $(AM_V_at)-rm -f libz.a $(AM_V_AR)$(libz_a_AR) libz.a $(libz_a_OBJECTS) $(libz_a_LIBADD) @@ -658,11 +692,13 @@ clean-checkPROGRAMS: @: > @ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp) @ZLIB_TREE@/test/example.$(OBJEXT): @ZLIB_TREE@/test/$(am__dirstamp) \ @ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp) + example$(EXEEXT): $(example_OBJECTS) $(example_DEPENDENCIES) $(EXTRA_example_DEPENDENCIES) @rm -f example$(EXEEXT) $(AM_V_CCLD)$(LINK) $(example_OBJECTS) $(example_LDADD) $(LIBS) @ZLIB_TREE@/test/minigzip.$(OBJEXT): @ZLIB_TREE@/test/$(am__dirstamp) \ @ZLIB_TREE@/test/$(DEPDIR)/$(am__dirstamp) + minigzip$(EXEEXT): $(minigzip_OBJECTS) $(minigzip_DEPENDENCIES) $(EXTRA_minigzip_DEPENDENCIES) @rm -f minigzip$(EXEEXT) $(AM_V_CCLD)$(LINK) $(minigzip_OBJECTS) $(minigzip_LDADD) $(LIBS) @@ -716,13 +752,12 @@ distclean-compile: # (which will cause the Makefiles to be regenerated when you run 'make'); # (2) otherwise, pass the desired values on the 'make' command line. $(am__recursive_targets): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ case "$@" in \ @@ -825,7 +860,7 @@ distclean-tags: $(MAKE) $(AM_MAKEFLAGS) $< # Leading 'am--fnord' is there to ensure the list of targets does not -# exand to empty, as could happen e.g. with make check TESTS=''. +# expand to empty, as could happen e.g. with make check TESTS=''. am--fnord $(TEST_LOGS) $(TEST_LOGS:.log=.trs): $(am__force_recheck) am--force-recheck: @: @@ -1056,10 +1091,16 @@ dist-xz: distdir $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) diff --git a/Build/source/libs/zlib/aclocal.m4 b/Build/source/libs/zlib/aclocal.m4 index bf5a36b0cc0..4a6e961b497 100644 --- a/Build/source/libs/zlib/aclocal.m4 +++ b/Build/source/libs/zlib/aclocal.m4 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.13.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -32,10 +32,10 @@ To do so, use the procedure documented by the package, typically 'autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.1], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.1])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -373,7 +373,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the @@ -418,6 +418,12 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -526,7 +532,48 @@ dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -534,7 +581,6 @@ dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -752,6 +798,70 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + # Check to make sure that the build environment is sane. -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -961,80 +1071,120 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], [# Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AC_SUBST([AMTAR], ['$${TAR-tar}']) -m4_if([$1], [v7], - [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of '-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + AM_RUN_LOG([cat conftest.dir/file]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar <conftest.tar]) - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR m4_include([../../m4/kpse-common.m4]) +m4_include([../../m4/kpse-largefile.m4]) +m4_include([../../m4/kpse-visibility.m4]) m4_include([../../m4/kpse-warnings.m4]) m4_include([../../m4/kpse-win32.m4]) diff --git a/Build/source/libs/zlib/configure b/Build/source/libs/zlib/configure index 584e3e3cf85..529bf4ff637 100755 --- a/Build/source/libs/zlib/configure +++ b/Build/source/libs/zlib/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for zlib for TeX Live 1.2.7. +# Generated by GNU Autoconf 2.69 for zlib for TeX Live 1.2.8. # # Report bugs to <tex-k@tug.org>. # @@ -580,12 +580,12 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='zlib for TeX Live' PACKAGE_TARNAME='zlib-for-tex-live' -PACKAGE_VERSION='1.2.7' -PACKAGE_STRING='zlib for TeX Live 1.2.7' +PACKAGE_VERSION='1.2.8' +PACKAGE_STRING='zlib for TeX Live 1.2.8' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' -ac_unique_file="zlib-1.2.7/zlib.h" +ac_unique_file="zlib-1.2.8/zlib.h" # Factoring default headers for most tests. ac_includes_default="\ #include <stdio.h> @@ -633,6 +633,7 @@ GREP CPP build_FALSE build_TRUE +VISIBILITY_CFLAGS LN_S RANLIB WARNING_CFLAGS @@ -1279,7 +1280,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures zlib for TeX Live 1.2.7 to adapt to many kinds of systems. +\`configure' configures zlib for TeX Live 1.2.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1347,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of zlib for TeX Live 1.2.7:";; + short | recursive ) echo "Configuration of zlib for TeX Live 1.2.8:";; esac cat <<\_ACEOF @@ -1444,7 +1445,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -zlib for TeX Live configure 1.2.7 +zlib for TeX Live configure 1.2.8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1746,7 +1747,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by zlib for TeX Live $as_me 1.2.7, which was +It was created by zlib for TeX Live $as_me 1.2.8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2127,7 +2128,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -am__api_version='1.13' +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -3443,6 +3444,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -3610,7 +3670,7 @@ fi # Define the identity of the package. PACKAGE='zlib-for-tex-live' - VERSION='1.2.7' + VERSION='1.2.8' cat >>confdefs.h <<_ACEOF @@ -3650,6 +3710,10 @@ mkdir_p='$(MKDIR_P)' # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' @@ -3657,6 +3721,48 @@ am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 $as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; } # Check whether --enable-maintainer-mode was given. @@ -4303,6 +4409,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -4535,6 +4700,56 @@ $as_echo "no, using $LN_S" >&6; } fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking CFLAGS for C to hide external symbols" >&5 +$as_echo_n "checking CFLAGS for C to hide external symbols... " >&6; } +if ${kpse_cv_visibility_cflags+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +kpse_cv_visibility_cflags=unknown +kpse_save_flags=$CFLAGS +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#include <stdio.h> + extern void foo(void); + void foo(void){printf("foo\n");} +_ACEOF +# FIXME: Add tests for non-GNU compilers +for kpse_flag in '-fvisibility=hidden'; do + CFLAGS="$kpse_save_flags $kpse_flag" + if ac_fn_c_try_compile "$LINENO"; then : + kpse_cv_visibility_cflags=$kpse_flag; break +fi +rm -f core conftest.err conftest.$ac_objext +done +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $kpse_cv_visibility_cflags" >&5 +$as_echo "$kpse_cv_visibility_cflags" >&6; } +CFLAGS=$kpse_save_flags +case $kpse_cv_visibility_cflags in #( + unknown) : + ;; #( + *) : + VISIBILITY_CFLAGS=$kpse_cv_visibility_cflags + ;; +esac + + + + + ac_config_headers="$ac_config_headers config.h" if test "x$enable_build" != xno; then @@ -4972,7 +5187,7 @@ fi done -ZCONF_SRC=zlib-1.2.7/zconf.h.in +ZCONF_SRC=zlib-1.2.8/zconf.h.in if test x"$ac_cv_header_unistd_h" = xyes; then zconf_sh='sed <$srcdir/'"$ZCONF_SRC"' "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\\(.*\\) may be/ 1\\1 was/" >' else @@ -5247,7 +5462,7 @@ $as_echo "#define HAVE_FSEEKO 1" >>confdefs.h fi -if test "$enable_largefile" != no; then +if test "x$enable_largefile" != xno; then case $ac_cv_sys_file_offset_bits in #( no) : ;; #( @@ -5256,19 +5471,20 @@ if test "$enable_largefile" != no; then no | unknown) : ;; #( *) : - ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGE_FILES=1" ;; + ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGE_FILES" ;; esac ;; #( *) : - ZLIB_DEFINES="$ZLIB_DEFINES -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE=1" ;; + ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64" ;; esac fi case $ac_cv_sys_largefile_source in #( no | unknown) : ;; #( *) : - ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGEFILE_SOURCE=1" ;; + ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGEFILE_SOURCE" ;; esac + ac_config_commands="$ac_config_commands zconf.h" @@ -5352,7 +5568,7 @@ fi -ZLIB_TREE=zlib-1.2.7 +ZLIB_TREE=zlib-1.2.8 if test -f $srcdir/$ZLIB_TREE/zconf.h; then @@ -5904,7 +6120,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by zlib for TeX Live $as_me 1.2.7, which was +This file was extended by zlib for TeX Live $as_me 1.2.8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5970,7 +6186,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -zlib for TeX Live config.status 1.2.7 +zlib for TeX Live config.status 1.2.8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -6752,7 +6968,7 @@ $as_echo X"$mf" | DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the diff --git a/Build/source/libs/zlib/configure.ac b/Build/source/libs/zlib/configure.ac index 935b3fb9537..0b00daaff4d 100644 --- a/Build/source/libs/zlib/configure.ac +++ b/Build/source/libs/zlib/configure.ac @@ -19,7 +19,9 @@ AC_PROG_CC AC_PROG_RANLIB AC_PROG_LN_S -AC_CONFIG_HEADERS([config.h])[]dnl unused, to avoid zillions of -D' on command line +KPSE_COMPILER_VISIBILITY + +AC_CONFIG_HEADERS([config.h])[]dnl unused, to avoid zillions of -D's on command line AM_CONDITIONAL([build], [test "x$enable_build" != xno]) @@ -44,20 +46,7 @@ else zconf_sh='cp $srcdir/'"$ZCONF_SRC" fi -AC_SYS_LARGEFILE -AC_FUNC_FSEEKO -dnl add to ZLIB_DEFINES -if test "$enable_largefile" != no; then - AS_CASE([$ac_cv_sys_file_offset_bits], - [no], [], - [unknown], [AS_CASE([$ac_cv_sys_large_files], - [no | unknown], [], - [ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGE_FILES=1"])], - [ZLIB_DEFINES="$ZLIB_DEFINES -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE=1"]) -fi -AS_CASE([$ac_cv_sys_largefile_source], - [no | unknown], [], - [ZLIB_DEFINES="$ZLIB_DEFINES -D_LARGEFILE_SOURCE=1"]) +KPSE_LARGEFILE([ZLIB_DEFINES], [_LARGEFILE64_SOURCE]) AC_CONFIG_COMMANDS([zconf.h], [eval "$zconf_sh" zconf.h], diff --git a/Build/source/libs/zlib/include/Makefile.in b/Build/source/libs/zlib/include/Makefile.in index 2dcbb66e8e1..bff687e4a49 100644 --- a/Build/source/libs/zlib/include/Makefile.in +++ b/Build/source/libs/zlib/include/Makefile.in @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.13.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2012 Free Software Foundation, Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,23 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ -am__make_dryrun = \ - { \ - am__dry=no; \ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ case $$MAKEFLAGS in \ *\\[\ \ ]*) \ - echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \ - | grep '^AM OK$$' >/dev/null || am__dry=yes;; \ - *) \ - for am__flg in $$MAKEFLAGS; do \ - case $$am__flg in \ - *=*|--*) ;; \ - *n*) am__dry=yes; break;; \ - esac; \ - done;; \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ esac; \ - test $$am__dry = yes; \ - } + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -52,6 +80,8 @@ DIST_COMMON = $(top_srcdir)/../am/hdr_links.am $(srcdir)/Makefile.in \ subdir = include ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../m4/kpse-common.m4 \ + $(top_srcdir)/../../m4/kpse-largefile.m4 \ + $(top_srcdir)/../../m4/kpse-visibility.m4 \ $(top_srcdir)/../../m4/kpse-warnings.m4 \ $(top_srcdir)/../../m4/kpse-win32.m4 $(top_srcdir)/version.ac \ $(top_srcdir)/configure.ac @@ -130,6 +160,7 @@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ STRIP = @STRIP@ VERSION = @VERSION@ +VISIBILITY_CFLAGS = @VISIBILITY_CFLAGS@ WARNING_CFLAGS = @WARNING_CFLAGS@ ZLIB_DEFINES = @ZLIB_DEFINES@ ZLIB_TREE = @ZLIB_TREE@ diff --git a/Build/source/libs/zlib/version.ac b/Build/source/libs/zlib/version.ac index 35484ea08f2..7b24133a28d 100644 --- a/Build/source/libs/zlib/version.ac +++ b/Build/source/libs/zlib/version.ac @@ -1,5 +1,5 @@ dnl -dnl Copyright (C) 2012 Peter Breitenlohner <tex-live@tug.org> +dnl Copyright (C) 2012-2013 Peter Breitenlohner <tex-live@tug.org> dnl dnl This file is free software; the copyright holder dnl gives unlimited permission to copy and/or distribute it, @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current zlib version -m4_define([zlib_version], [1.2.7]) +m4_define([zlib_version], [1.2.8]) diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj.user b/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj.user deleted file mode 100644 index ace9a86acb7..00000000000 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -</Project>
\ No newline at end of file diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj.user b/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj.user deleted file mode 100644 index ace9a86acb7..00000000000 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -</Project>
\ No newline at end of file diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj.user b/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj.user deleted file mode 100644 index ace9a86acb7..00000000000 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -</Project>
\ No newline at end of file diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj.user b/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj.user deleted file mode 100644 index ace9a86acb7..00000000000 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -</Project>
\ No newline at end of file diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj.user b/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj.user deleted file mode 100644 index ace9a86acb7..00000000000 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -</Project>
\ No newline at end of file diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj.user b/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj.user deleted file mode 100644 index ace9a86acb7..00000000000 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj.user +++ /dev/null @@ -1,3 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> -</Project>
\ No newline at end of file diff --git a/Build/source/libs/zlib/zlib-1.2.7/zlib.3.pdf b/Build/source/libs/zlib/zlib-1.2.7/zlib.3.pdf Binary files differdeleted file mode 100644 index 485306cda8d..00000000000 --- a/Build/source/libs/zlib/zlib-1.2.7/zlib.3.pdf +++ /dev/null diff --git a/Build/source/libs/zlib/zlib-1.2.7-PATCHES/ChangeLog b/Build/source/libs/zlib/zlib-1.2.8-PATCHES/ChangeLog index 2e529404838..2e529404838 100644 --- a/Build/source/libs/zlib/zlib-1.2.7-PATCHES/ChangeLog +++ b/Build/source/libs/zlib/zlib-1.2.8-PATCHES/ChangeLog diff --git a/Build/source/libs/zlib/zlib-1.2.7-PATCHES/TL-Changes b/Build/source/libs/zlib/zlib-1.2.8-PATCHES/TL-Changes index 7dd7f9d16a5..ff8926beb12 100644 --- a/Build/source/libs/zlib/zlib-1.2.7-PATCHES/TL-Changes +++ b/Build/source/libs/zlib/zlib-1.2.8-PATCHES/TL-Changes @@ -1,7 +1,8 @@ -Changes applied to the zlib-1.2.6/ tree as obtained from: - http://zlib.net/zlib-1.2.6.tar.bz2 +Changes applied to the zlib-1.2.8/ tree as obtained from: + http://zlib.net/zlib-1.2.8.tar.xz Removed: + Makefile zconf.h doc/rfc* @@ -35,25 +36,28 @@ Converted Dos/Win line ends to native: contrib/vstudio/readme.txt contrib/vstudio/vc10/miniunz.vcxproj contrib/vstudio/vc10/miniunz.vcxproj.filters - contrib/vstudio/vc10/miniunz.vcxproj.user contrib/vstudio/vc10/minizip.vcxproj contrib/vstudio/vc10/minizip.vcxproj.filters - contrib/vstudio/vc10/minizip.vcxproj.user contrib/vstudio/vc10/testzlib.vcxproj contrib/vstudio/vc10/testzlib.vcxproj.filters - contrib/vstudio/vc10/testzlib.vcxproj.user contrib/vstudio/vc10/testzlibdll.vcxproj contrib/vstudio/vc10/testzlibdll.vcxproj.filters - contrib/vstudio/vc10/testzlibdll.vcxproj.user contrib/vstudio/vc10/zlib.rc contrib/vstudio/vc10/zlibstat.vcxproj contrib/vstudio/vc10/zlibstat.vcxproj.filters - contrib/vstudio/vc10/zlibstat.vcxproj.user contrib/vstudio/vc10/zlibvc.def contrib/vstudio/vc10/zlibvc.sln contrib/vstudio/vc10/zlibvc.vcxproj contrib/vstudio/vc10/zlibvc.vcxproj.filters - contrib/vstudio/vc10/zlibvc.vcxproj.user + contrib/vstudio/vc11/miniunz.vcxproj + contrib/vstudio/vc11/minizip.vcxproj + contrib/vstudio/vc11/testzlib.vcxproj + contrib/vstudio/vc11/testzlibdll.vcxproj + contrib/vstudio/vc11/zlib.rc + contrib/vstudio/vc11/zlibstat.vcxproj + contrib/vstudio/vc11/zlibvc.def + contrib/vstudio/vc11/zlibvc.sln + contrib/vstudio/vc11/zlibvc.vcxproj contrib/vstudio/vc9/miniunz.vcproj contrib/vstudio/vc9/minizip.vcproj contrib/vstudio/vc9/testzlib.vcproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/CMakeLists.txt b/Build/source/libs/zlib/zlib-1.2.8/CMakeLists.txt index 7ee3bc41bc9..0c0247cc516 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/CMakeLists.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/CMakeLists.txt @@ -3,7 +3,10 @@ set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON) project(zlib C) -set(VERSION "1.2.7") +set(VERSION "1.2.8") + +option(ASM686 "Enable building i686 assembly implementation") +option(AMD64 "Enable building amd64 assembly implementation") set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables") set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries") @@ -121,11 +124,44 @@ set(ZLIB_SRCS ) if(NOT MINGW) - set(ZLIB_SRCS ${ZLIB_SRCS} + set(ZLIB_DLL_SRCS win32/zlib1.rc # If present will override custom build rule below. ) endif() +if(CMAKE_COMPILER_IS_GNUCC) + if(ASM686) + set(ZLIB_ASMS contrib/asm686/match.S) + elseif (AMD64) + set(ZLIB_ASMS contrib/amd64/amd64-match.S) + endif () + + if(ZLIB_ASMS) + add_definitions(-DASMV) + set_source_files_properties(${ZLIB_ASMS} PROPERTIES LANGUAGE C COMPILE_FLAGS -DNO_UNDERLINE) + endif() +endif() + +if(MSVC) + if(ASM686) + ENABLE_LANGUAGE(ASM_MASM) + set(ZLIB_ASMS + contrib/masmx86/inffas32.asm + contrib/masmx86/match686.asm + ) + elseif (AMD64) + ENABLE_LANGUAGE(ASM_MASM) + set(ZLIB_ASMS + contrib/masmx64/gvmat64.asm + contrib/masmx64/inffasx64.asm + ) + endif() + + if(ZLIB_ASMS) + add_definitions(-DASMV -DASMINF) + endif() +endif() + # parse the full version number from zlib.h and include in ZLIB_FULL_VERSION file(READ ${CMAKE_CURRENT_SOURCE_DIR}/zlib.h _zlib_h_contents) string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" @@ -134,7 +170,7 @@ string(REGEX REPLACE ".*#define[ \t]+ZLIB_VERSION[ \t]+\"([-0-9A-Za-z.]+)\".*" if(MINGW) # This gets us DLL resource information when compiling on MinGW. if(NOT CMAKE_RC_COMPILER) - SET(CMAKE_RC_COMPILER windres.exe) + set(CMAKE_RC_COMPILER windres.exe) endif() add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj @@ -144,11 +180,11 @@ if(MINGW) -I ${CMAKE_CURRENT_BINARY_DIR} -o ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj -i ${CMAKE_CURRENT_SOURCE_DIR}/win32/zlib1.rc) - set(ZLIB_SRCS ${ZLIB_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) + set(ZLIB_DLL_SRCS ${CMAKE_CURRENT_BINARY_DIR}/zlib1rc.obj) endif(MINGW) -add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) -add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +add_library(zlib SHARED ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_DLL_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) +add_library(zlibstatic STATIC ${ZLIB_SRCS} ${ZLIB_ASMS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS}) set_target_properties(zlib PROPERTIES DEFINE_SYMBOL ZLIB_DLL) set_target_properties(zlib PROPERTIES SOVERSION 1) @@ -166,7 +202,9 @@ endif() if(UNIX) # On unix-like platforms the library is almost always called libz set_target_properties(zlib zlibstatic PROPERTIES OUTPUT_NAME z) - set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,${CMAKE_CURRENT_SOURCE_DIR}/zlib.map") + if(NOT APPLE) + set_target_properties(zlib PROPERTIES LINK_FLAGS "-Wl,--version-script,\"${CMAKE_CURRENT_SOURCE_DIR}/zlib.map\"") + endif() elseif(BUILD_SHARED_LIBS AND WIN32) # Creates zlib1.dll when building shared library version set_target_properties(zlib PROPERTIES SUFFIX "1.dll") diff --git a/Build/source/libs/zlib/zlib-1.2.7/ChangeLog b/Build/source/libs/zlib/zlib-1.2.8/ChangeLog index c2c643a1a9b..f22aabaef53 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/ChangeLog +++ b/Build/source/libs/zlib/zlib-1.2.8/ChangeLog @@ -1,6 +1,69 @@ ChangeLog file for zlib +Changes in 1.2.8 (28 Apr 2013) +- Update contrib/minizip/iowin32.c for Windows RT [Vollant] +- Do not force Z_CONST for C++ +- Clean up contrib/vstudio [Ro§] +- Correct spelling error in zlib.h +- Fix mixed line endings in contrib/vstudio + +Changes in 1.2.7.3 (13 Apr 2013) +- Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc + +Changes in 1.2.7.2 (13 Apr 2013) +- Change check for a four-byte type back to hexadecimal +- Fix typo in win32/Makefile.msc +- Add casts in gzwrite.c for pointer differences + +Changes in 1.2.7.1 (24 Mar 2013) +- Replace use of unsafe string functions with snprintf if available +- Avoid including stddef.h on Windows for Z_SOLO compile [Niessink] +- Fix gzgetc undefine when Z_PREFIX set [Turk] +- Eliminate use of mktemp in Makefile (not always available) +- Fix bug in 'F' mode for gzopen() +- Add inflateGetDictionary() function +- Correct comment in deflate.h +- Use _snprintf for snprintf in Microsoft C +- On Darwin, only use /usr/bin/libtool if libtool is not Apple +- Delete "--version" file if created by "ar --version" [Richard G.] +- Fix configure check for veracity of compiler error return codes +- Fix CMake compilation of static lib for MSVC2010 x64 +- Remove unused variable in infback9.c +- Fix argument checks in gzlog_compress() and gzlog_write() +- Clean up the usage of z_const and respect const usage within zlib +- Clean up examples/gzlog.[ch] comparisons of different types +- Avoid shift equal to bits in type (caused endless loop) +- Fix unintialized value bug in gzputc() introduced by const patches +- Fix memory allocation error in examples/zran.c [Nor] +- Fix bug where gzopen(), gzclose() would write an empty file +- Fix bug in gzclose() when gzwrite() runs out of memory +- Check for input buffer malloc failure in examples/gzappend.c +- Add note to contrib/blast to use binary mode in stdio +- Fix comparisons of differently signed integers in contrib/blast +- Check for invalid code length codes in contrib/puff +- Fix serious but very rare decompression bug in inftrees.c +- Update inflateBack() comments, since inflate() can be faster +- Use underscored I/O function names for WINAPI_FAMILY +- Add _tr_flush_bits to the external symbols prefixed by --zprefix +- Add contrib/vstudio/vc10 pre-build step for static only +- Quote --version-script argument in CMakeLists.txt +- Don't specify --version-script on Apple platforms in CMakeLists.txt +- Fix casting error in contrib/testzlib/testzlib.c +- Fix types in contrib/minizip to match result of get_crc_table() +- Simplify contrib/vstudio/vc10 with 'd' suffix +- Add TOP support to win32/Makefile.msc +- Suport i686 and amd64 assembler builds in CMakeLists.txt +- Fix typos in the use of _LARGEFILE64_SOURCE in zconf.h +- Add vc11 and vc12 build files to contrib/vstudio +- Add gzvprintf() as an undocumented function in zlib +- Fix configure for Sun shell +- Remove runtime check in configure for four-byte integer type +- Add casts and consts to ease user conversion to C++ +- Add man pages for minizip and miniunzip +- In Makefile uninstall, don't rm if preceding cd fails +- Do not return Z_BUF_ERROR if deflateParam() has nothing to write + Changes in 1.2.7 (2 May 2012) - Replace use of memmove() with a simple copy for portability - Test for existence of strerror diff --git a/Build/source/libs/zlib/zlib-1.2.7/FAQ b/Build/source/libs/zlib/zlib-1.2.8/FAQ index 99b7cf92e45..99b7cf92e45 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/FAQ +++ b/Build/source/libs/zlib/zlib-1.2.8/FAQ diff --git a/Build/source/libs/zlib/zlib-1.2.7/INDEX b/Build/source/libs/zlib/zlib-1.2.8/INDEX index 2ba06412048..2ba06412048 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/INDEX +++ b/Build/source/libs/zlib/zlib-1.2.8/INDEX diff --git a/Build/source/libs/zlib/zlib-1.2.7/Makefile b/Build/source/libs/zlib/zlib-1.2.8/Makefile index 6bba86c73fc..6bba86c73fc 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/Makefile +++ b/Build/source/libs/zlib/zlib-1.2.8/Makefile diff --git a/Build/source/libs/zlib/zlib-1.2.7/Makefile.in b/Build/source/libs/zlib/zlib-1.2.8/Makefile.in index 241deed83ae..c61aa3008d4 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/Makefile.in +++ b/Build/source/libs/zlib/zlib-1.2.8/Makefile.in @@ -1,5 +1,5 @@ # Makefile for zlib -# Copyright (C) 1995-2011 Jean-loup Gailly. +# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: @@ -32,7 +32,7 @@ CPP=$(CC) -E STATICLIB=libz.a SHAREDLIB=libz.so -SHAREDLIBV=libz.so.1.2.7 +SHAREDLIBV=libz.so.1.2.8 SHAREDLIBM=libz.so.1 LIBS=$(STATICLIB) $(SHAREDLIBV) @@ -83,7 +83,7 @@ check: test test: all teststatic testshared teststatic: static - @TMPST=`mktemp fooXXXXXX`; \ + @TMPST=tmpst_$$; \ if echo hello world | ./minigzip | ./minigzip -d && ./example $$TMPST ; then \ echo ' *** zlib test OK ***'; \ else \ @@ -96,7 +96,7 @@ testshared: shared LD_LIBRARYN32_PATH=`pwd`:$(LD_LIBRARYN32_PATH) ; export LD_LIBRARYN32_PATH; \ DYLD_LIBRARY_PATH=`pwd`:$(DYLD_LIBRARY_PATH) ; export DYLD_LIBRARY_PATH; \ SHLIB_PATH=`pwd`:$(SHLIB_PATH) ; export SHLIB_PATH; \ - TMPSH=`mktemp fooXXXXXX`; \ + TMPSH=tmpsh_$$; \ if echo hello world | ./minigzipsh | ./minigzipsh -d && ./examplesh $$TMPSH; then \ echo ' *** zlib shared test OK ***'; \ else \ @@ -105,7 +105,7 @@ testshared: shared rm -f $$TMPSH test64: all64 - @TMP64=`mktemp fooXXXXXX`; \ + @TMP64=tmp64_$$; \ if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \ echo ' *** zlib 64-bit test OK ***'; \ else \ @@ -216,13 +216,13 @@ install: install-libs chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h uninstall: - cd $(DESTDIR)$(includedir); rm -f zlib.h zconf.h - cd $(DESTDIR)$(libdir); rm -f libz.a; \ + cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h + cd $(DESTDIR)$(libdir) && rm -f libz.a; \ if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \ rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \ fi - cd $(DESTDIR)$(man3dir); rm -f zlib.3 - cd $(DESTDIR)$(pkgconfigdir); rm -f zlib.pc + cd $(DESTDIR)$(man3dir) && rm -f zlib.3 + cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc docs: zlib.3.pdf @@ -230,7 +230,7 @@ zlib.3.pdf: zlib.3 groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf zconf.h.cmakein: zconf.h.in - -@ TEMPFILE=`mktemp __XXXXXX`; \ + -@ TEMPFILE=zconfh_$$; \ echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\ sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\ touch -r zconf.h.in zconf.h.cmakein &&\ diff --git a/Build/source/libs/zlib/zlib-1.2.7/README b/Build/source/libs/zlib/zlib-1.2.8/README index 6f1255ffe48..5ca9d127eda 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/README +++ b/Build/source/libs/zlib/zlib-1.2.8/README @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.7 is a general purpose data compression library. All the code is +zlib 1.2.8 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and @@ -31,7 +31,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997 issue of Dr. Dobb's Journal; a copy of the article is available at http://marknelson.us/1997/01/01/zlib-engine/ . -The changes made in version 1.2.7 are documented in the file ChangeLog. +The changes made in version 1.2.8 are documented in the file ChangeLog. Unsupported third party contributions are provided in directory contrib/ . @@ -84,7 +84,7 @@ Acknowledgments: Copyright notice: - (C) 1995-2012 Jean-loup Gailly and Mark Adler + (C) 1995-2013 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages diff --git a/Build/source/libs/zlib/zlib-1.2.7/adler32.c b/Build/source/libs/zlib/zlib-1.2.8/adler32.c index a868f073d8a..a868f073d8a 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/adler32.c +++ b/Build/source/libs/zlib/zlib-1.2.8/adler32.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/amiga/Makefile.pup b/Build/source/libs/zlib/zlib-1.2.8/amiga/Makefile.pup index 8940c120fbb..8940c120fbb 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/amiga/Makefile.pup +++ b/Build/source/libs/zlib/zlib-1.2.8/amiga/Makefile.pup diff --git a/Build/source/libs/zlib/zlib-1.2.7/amiga/Makefile.sas b/Build/source/libs/zlib/zlib-1.2.8/amiga/Makefile.sas index 749e2915271..749e2915271 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/amiga/Makefile.sas +++ b/Build/source/libs/zlib/zlib-1.2.8/amiga/Makefile.sas diff --git a/Build/source/libs/zlib/zlib-1.2.7/as400/bndsrc b/Build/source/libs/zlib/zlib-1.2.8/as400/bndsrc index 52cc6613b30..98814fd4c14 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/as400/bndsrc +++ b/Build/source/libs/zlib/zlib-1.2.8/as400/bndsrc @@ -202,4 +202,14 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB') EXPORT SYMBOL("inflateResetKeep") +/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ +/* Version 1.2.8 additional entry points. */ +/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/ + +/********************************************************************/ +/* *MODULE INFLATE ZLIB 01/02/01 00:15:09 */ +/********************************************************************/ + + EXPORT SYMBOL("inflateGetDictionary") + ENDPGMEXP diff --git a/Build/source/libs/zlib/zlib-1.2.7/as400/compile.clp b/Build/source/libs/zlib/zlib-1.2.8/as400/compile.clp index 8d0c58f51e1..e3f47c63872 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/as400/compile.clp +++ b/Build/source/libs/zlib/zlib-1.2.8/as400/compile.clp @@ -105,6 +105,6 @@ &MODLIB/TREES &MODLIB/UNCOMPR + &MODLIB/ZUTIL) + SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC) + - TEXT('ZLIB 1.2.7') TGTRLS(&TGTRLS) + TEXT('ZLIB 1.2.8') TGTRLS(&TGTRLS) ENDPGM diff --git a/Build/source/libs/zlib/zlib-1.2.7/as400/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/as400/readme.txt index 23cd1b8a3c5..7b5d93bf51f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/as400/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/as400/readme.txt @@ -1,4 +1,4 @@ - ZLIB version 1.2.7 for AS400 installation instructions + ZLIB version 1.2.8 for AS400 installation instructions I) From an AS400 *SAVF file: diff --git a/Build/source/libs/zlib/zlib-1.2.7/as400/zlib.inc b/Build/source/libs/zlib/zlib-1.2.8/as400/zlib.inc index 747c598aa05..7341a6d8187 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/as400/zlib.inc +++ b/Build/source/libs/zlib/zlib-1.2.8/as400/zlib.inc @@ -1,7 +1,7 @@ * ZLIB.INC - Interface to the general purpose compression library * * ILE RPG400 version by Patrick Monnerat, DATASPHERE. - * Version 1.2.7 + * Version 1.2.8 * * * WARNING: @@ -22,12 +22,12 @@ * * Versioning information. * - D ZLIB_VERSION C '1.2.7' - D ZLIB_VERNUM C X'1270' + D ZLIB_VERSION C '1.2.8' + D ZLIB_VERNUM C X'1280' D ZLIB_VER_MAJOR C 1 D ZLIB_VER_MINOR C 2 D ZLIB_VER_REVISION... - D C 7 + D C 8 D ZLIB_VER_SUBREVISION... D C 0 * @@ -359,6 +359,12 @@ D dictionary 65535 const options(*varsize) Dictionary bytes D dictLength 10U 0 value Dictionary length * + D inflateGetDictionary... + D PR 10I 0 extproc('inflateGetDictionary') Get dictionary + D strm like(z_stream) Expansion stream + D dictionary 65535 options(*varsize) Dictionary bytes + D dictLength 10U 0 Dictionary length + * D inflateSync PR 10I 0 extproc('inflateSync') Sync. expansion D strm like(z_stream) Expansion stream * diff --git a/Build/source/libs/zlib/zlib-1.2.7/compress.c b/Build/source/libs/zlib/zlib-1.2.8/compress.c index ea4dfbe9d7b..6e9762676a0 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/compress.c +++ b/Build/source/libs/zlib/zlib-1.2.8/compress.c @@ -29,7 +29,7 @@ int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = (z_const Bytef *)source; stream.avail_in = (uInt)sourceLen; #ifdef MAXSEG_64K /* Check for source > 64K on 16-bit machine: */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/configure b/Build/source/libs/zlib/zlib-1.2.8/configure index 36c7d8ec215..b77a8a8cf95 100755 --- a/Build/source/libs/zlib/zlib-1.2.7/configure +++ b/Build/source/libs/zlib/zlib-1.2.8/configure @@ -70,6 +70,7 @@ shared=1 solo=0 cover=0 zprefix=0 +zconst=0 build64=0 gcc=0 old_cc="$CC" @@ -77,13 +78,26 @@ old_cflags="$CFLAGS" OBJC='$(OBJZ) $(OBJG)' PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)' +# leave this script, optionally in a bad way +leave() +{ + if test "$*" != "0"; then + echo "** $0 aborting." | tee -a configure.log + fi + rm -f $test.[co] $test $test$shared_ext $test.gcno ./--version + echo -------------------- >> configure.log + echo >> configure.log + echo >> configure.log + exit $1 +} + # process command line options while test $# -ge 1 do case "$1" in -h* | --help) echo 'usage:' | tee -a configure.log - echo ' configure [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' | tee -a configure.log + echo ' configure [--const] [--zprefix] [--prefix=PREFIX] [--eprefix=EXPREFIX]' | tee -a configure.log echo ' [--static] [--64] [--libdir=LIBDIR] [--sharedlibdir=LIBDIR]' | tee -a configure.log echo ' [--includedir=INCLUDEDIR] [--archs="-arch i386 -arch x86_64"]' | tee -a configure.log exit 0 ;; @@ -106,13 +120,18 @@ case "$1" in -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;; --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;; --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;; - *) echo "unknown option: $1"; echo "$0 --help for help" | tee -a configure.log; exit 1 ;; + -c* | --const) zconst=1; shift ;; + *) + echo "unknown option: $1" | tee -a configure.log + echo "$0 --help for help" | tee -a configure.log + leave 1;; esac done -# define functions for testing compiler and library characteristics and logging the results +# temporary file name test=ztest$$ +# put arguments in log, also put test file in log if used in arguments show() { case "$*" in @@ -124,43 +143,6 @@ show() echo $* >> configure.log } -cat > $test.c <<EOF -#error error -EOF -if ($CC -c $CFLAGS $test.c) 2>/dev/null; then - try() - { - show $* - test "`( $* ) 2>&1 | tee -a configure.log`" = "" - } - echo - using any output from compiler to indicate an error >> configure.log -else - try() - { - show $* - ( $* ) >> configure.log 2>&1 - ret=$? - if test $ret -ne 0; then - echo "(exit code "$ret")" >> configure.log - fi - return $ret - } -fi - -tryboth() -{ - show $* - got=`( $* ) 2>&1` - ret=$? - printf %s "$got" >> configure.log - if test $ret -ne 0; then - return $ret - fi - test "$got" = "" -} - -echo >> configure.log - # check for gcc vs. cc and set compile and link flags based on the system identified by uname cat > $test.c <<EOF extern int getchar(); @@ -179,8 +161,8 @@ case `$cc -v 2>&1` in *gcc*) gcc=1 ;; esac -show $cc -c $cflags $test.c -if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then +show $cc -c $test.c +if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then echo ... using gcc >> configure.log CC="$cc" CFLAGS="${CFLAGS--O3} ${ARCHS}" @@ -191,7 +173,11 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then SFLAGS="${SFLAGS} -m64" fi if test "${ZLIBGCCWARN}" = "YES"; then - CFLAGS="${CFLAGS} -Wall -Wextra -pedantic" + if test "$zconst" -eq 1; then + CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST" + else + CFLAGS="${CFLAGS} -Wall -Wextra -pedantic" + fi fi if test -z "$uname"; then uname=`(uname -s || echo unknown) 2>/dev/null` @@ -208,7 +194,7 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then # temporary bypass rm -f $test.[co] $test $test$shared_ext echo "Please use win32/Makefile.gcc instead." | tee -a configure.log - exit 1 + leave 1 LDSHARED=${LDSHARED-"$cc -shared"} LDSHAREDLIBC="" EXE='.exe' ;; @@ -231,7 +217,11 @@ if test "$gcc" -eq 1 && ($cc -c $cflags $test.c) >> configure.log 2>&1; then SHAREDLIBV=libz.$VER$shared_ext SHAREDLIBM=libz.$VER1$shared_ext LDSHARED=${LDSHARED-"$cc -dynamiclib -install_name $libdir/$SHAREDLIBM -compatibility_version $VER1 -current_version $VER3"} - AR="/usr/bin/libtool" + if libtool -V 2>&1 | grep Apple > /dev/null; then + AR="libtool" + else + AR="/usr/bin/libtool" + fi ARFLAGS="-o" ;; *) LDSHARED=${LDSHARED-"$cc -shared"} ;; esac @@ -334,7 +324,61 @@ SHAREDLIBM=${SHAREDLIBM-"libz$shared_ext.$VER1"} echo >> configure.log +# define functions for testing compiler and library characteristics and logging the results + +cat > $test.c <<EOF +#error error +EOF +if ($CC -c $CFLAGS $test.c) 2>/dev/null; then + try() + { + show $* + test "`( $* ) 2>&1 | tee -a configure.log`" = "" + } + echo - using any output from compiler to indicate an error >> configure.log +else +try() +{ + show $* + ( $* ) >> configure.log 2>&1 + ret=$? + if test $ret -ne 0; then + echo "(exit code "$ret")" >> configure.log + fi + return $ret +} +fi + +tryboth() +{ + show $* + got=`( $* ) 2>&1` + ret=$? + printf %s "$got" >> configure.log + if test $ret -ne 0; then + return $ret + fi + test "$got" = "" +} + +cat > $test.c << EOF +int foo() { return 0; } +EOF +echo "Checking for obsessive-compulsive compiler options..." >> configure.log +if try $CC -c $CFLAGS $test.c; then + : +else + echo "Compiler error reporting is too harsh for $0 (perhaps remove -Werror)." | tee -a configure.log + leave 1 +fi + +echo >> configure.log + # see if shared library build supported +cat > $test.c <<EOF +extern int getchar(); +int hello() {return getchar();} +EOF if test $shared -eq 1; then echo Checking for shared library support... | tee -a configure.log # we must test in two steps (cc then ld), required at least on SunOS 4.x @@ -362,8 +406,6 @@ else TEST="all teststatic testshared" fi -echo >> configure.log - # check for underscores in external names for use by assembler code CPP=${CPP-"$CC -E"} case $CFLAGS in @@ -698,35 +740,6 @@ EOF fi fi -echo >> configure.log - -# find a four-byte unsiged integer type for crc calculations -cat > $test.c <<EOF -#include <stdio.h> -#define is32(n,t) for(n=1,k=0;n;n<<=1,k++);if(k==32){puts(t);return 0;} -int main() { - int k; - unsigned i; - unsigned long l; - unsigned short s; - is32(i, "unsigned") - is32(l, "unsigned long") - is32(s, "unsigned short") - return 1; -} -EOF -Z_U4="" -if try $CC $CFLAGS $test.c -o $test && Z_U4=`./$test` && test -n "$Z_U4"; then - sed < zconf.h "/#define Z_U4/s/\/\* \.\/configure may/#define Z_U4 $Z_U4 \/* .\/configure put the/" > zconf.temp.h - mv zconf.temp.h zconf.h - echo "Looking for a four-byte integer type... Found." | tee -a configure.log -else - echo "Looking for a four-byte integer type... Not found." | tee -a configure.log -fi - -# clean up files produced by running the compiler and linker -rm -f $test.[co] $test $test$shared_ext $test.gcno - # show the results in the log echo >> configure.log echo ALL = $ALL >> configure.log @@ -758,9 +771,6 @@ echo mandir = $mandir >> configure.log echo prefix = $prefix >> configure.log echo sharedlibdir = $sharedlibdir >> configure.log echo uname = $uname >> configure.log -echo -------------------- >> configure.log -echo >> configure.log -echo >> configure.log # udpate Makefile with the configure results sed < Makefile.in " @@ -816,3 +826,6 @@ sed < zlib.pc.in " " | sed -e " s/\@VERSION\@/$VER/g; " > zlib.pc + +# done +leave 0 diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/README.contrib b/Build/source/libs/zlib/zlib-1.2.8/contrib/README.contrib index dd2285d960a..c66349b7c67 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/README.contrib +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/README.contrib @@ -75,3 +75,4 @@ untgz/ by Pedro A. Aranda Gutierrez <paag@tid.es> vstudio/ by Gilles Vollant <info@winimage.com> Building a minizip-enhanced zlib with Microsoft Visual Studio + Includes vc11 from kreuzerkrieg and vc12 from davispuh diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/buffer_demo.adb b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/buffer_demo.adb index 46b8638107f..46b8638107f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/buffer_demo.adb +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/buffer_demo.adb diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/mtest.adb b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/mtest.adb index c4dfd080f0c..c4dfd080f0c 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/mtest.adb +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/mtest.adb diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/read.adb b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/read.adb index 1f2efbfeb80..1f2efbfeb80 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/read.adb +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/read.adb diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/readme.txt index ce4d2cadf0d..ce4d2cadf0d 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/readme.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/test.adb b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/test.adb index 90773acfa18..90773acfa18 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/test.adb +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/test.adb diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-streams.adb b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-streams.adb index b6497bae286..b6497bae286 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-streams.adb +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-streams.adb diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-streams.ads b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-streams.ads index f0193c6baee..f0193c6baee 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-streams.ads +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-streams.ads diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-thin.adb b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-thin.adb index 0ca4a712046..0ca4a712046 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-thin.adb +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-thin.adb diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-thin.ads b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-thin.ads index d4407eb800d..d4407eb800d 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib-thin.ads +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib-thin.ads diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.adb b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.adb index 8b6fd686ac7..8b6fd686ac7 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.adb +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.adb diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.ads b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.ads index 79ffc4095cf..79ffc4095cf 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.ads +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.ads diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.gpr b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.gpr index 296b22aa966..296b22aa966 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/ada/zlib.gpr +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/ada/zlib.gpr diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/amd64/amd64-match.S b/Build/source/libs/zlib/zlib-1.2.8/contrib/amd64/amd64-match.S index 81d4a1c9494..81d4a1c9494 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/amd64/amd64-match.S +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/amd64/amd64-match.S diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/asm686/README.686 b/Build/source/libs/zlib/zlib-1.2.8/contrib/asm686/README.686 index a0bf3bea4af..a0bf3bea4af 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/asm686/README.686 +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/asm686/README.686 diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/asm686/match.S b/Build/source/libs/zlib/zlib-1.2.8/contrib/asm686/match.S index fa421092785..fa421092785 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/asm686/match.S +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/asm686/match.S diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/Makefile b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/Makefile index 9be80bafe05..9be80bafe05 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/Makefile +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/Makefile diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/README b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/README index e3a60b3f5cc..e3a60b3f5cc 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/README +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/README diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/blast.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/blast.c index 4ce697a41fb..69ef0fe00e8 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/blast.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/blast.c @@ -1,7 +1,7 @@ /* blast.c - * Copyright (C) 2003 Mark Adler + * Copyright (C) 2003, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in blast.h - * version 1.1, 16 Feb 2003 + * version 1.2, 24 Oct 2012 * * blast.c decompresses data compressed by the PKWare Compression Library. * This function provides functionality similar to the explode() function of @@ -22,6 +22,8 @@ * * 1.0 12 Feb 2003 - First version * 1.1 16 Feb 2003 - Fixed distance check for > 4 GB uncompressed data + * 1.2 24 Oct 2012 - Add note about using binary mode in stdio + * - Fix comparisons of differently signed integers */ #include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */ @@ -279,7 +281,7 @@ local int decomp(struct state *s) int dict; /* log2(dictionary size) - 6 */ int symbol; /* decoded symbol, extra bits for distance */ int len; /* length for copy */ - int dist; /* distance for copy */ + unsigned dist; /* distance for copy */ int copy; /* copy counter */ unsigned char *from, *to; /* copy pointers */ static int virgin = 1; /* build tables once */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/blast.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/blast.h index ce9e5410f49..658cfd32004 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/blast.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/blast.h @@ -1,6 +1,6 @@ /* blast.h -- interface for blast.c - Copyright (C) 2003 Mark Adler - version 1.1, 16 Feb 2003 + Copyright (C) 2003, 2012 Mark Adler + version 1.2, 24 Oct 2012 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -28,6 +28,10 @@ * that library. (Note: PKWare overused the "implode" verb, and the format * used by their library implode() function is completely different and * incompatible with the implode compression method supported by PKZIP.) + * + * The binary mode for stdio functions should be used to assure that the + * compressed data is not corrupted when read or written. For example: + * fopen(..., "rb") and fopen(..., "wb"). */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/test.pk b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/test.pk Binary files differindex be10b2bbb25..be10b2bbb25 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/test.pk +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/test.pk diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/test.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/test.txt index bfdf1c5dca0..bfdf1c5dca0 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/blast/test.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/blast/test.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/ZLib.pas b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/ZLib.pas index f24bb3eda0e..a579974f044 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/ZLib.pas +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/ZLib.pas @@ -152,7 +152,7 @@ procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer; const OutBuf: Pointer; BufSize: Integer); const - zlib_version = '1.2.7'; + zlib_version = '1.2.8'; type EZlibError = class(Exception); diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/ZLibConst.pas b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/ZLibConst.pas index cdfe13671d3..cdfe13671d3 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/ZLibConst.pas +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/ZLibConst.pas diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/readme.txt index 2dc9a8bba2f..2dc9a8bba2f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/readme.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/zlibd32.mak b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/zlibd32.mak index 9bb00b7cc42..9bb00b7cc42 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/delphi/zlibd32.mak +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/delphi/zlibd32.mak diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.build b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.build index e69630cec2d..e69630cec2d 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.build +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.build diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.chm b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.chm Binary files differindex f214a444aeb..f214a444aeb 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.chm +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.chm diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.sln b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.sln index 5d533d6bc57..5d533d6bc57 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib.sln +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib.sln diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/AssemblyInfo.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/AssemblyInfo.cs index 724c5347f35..724c5347f35 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/AssemblyInfo.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/AssemblyInfo.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/ChecksumImpl.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/ChecksumImpl.cs index fe9b23405e2..fe9b23405e2 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/ChecksumImpl.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/ChecksumImpl.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/CircularBuffer.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/CircularBuffer.cs index 9c8d601954f..9c8d601954f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/CircularBuffer.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/CircularBuffer.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/CodecBase.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/CodecBase.cs index b0eb78a0221..b0eb78a0221 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/CodecBase.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/CodecBase.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/Deflater.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/Deflater.cs index 9039f41f663..9039f41f663 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/Deflater.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/Deflater.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/DotZLib.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.cs index 90c7c3b3807..90c7c3b3807 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/DotZLib.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/DotZLib.csproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.csproj index dea7fb16a94..dea7fb16a94 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/DotZLib.csproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/DotZLib.csproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/GZipStream.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/GZipStream.cs index f0eada1d24b..f0eada1d24b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/GZipStream.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/GZipStream.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/Inflater.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/Inflater.cs index d295f268048..d295f268048 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/Inflater.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/Inflater.cs diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/UnitTests.cs b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/UnitTests.cs index 24c639928fd..15394614054 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/DotZLib/UnitTests.cs @@ -1,5 +1,5 @@ // -// © Copyright Henrik Ravn 2004 +// © Copyright Henrik Ravn 2004 // // Use, modification and distribution are subject to the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) @@ -156,7 +156,7 @@ namespace DotZLibTests public void Info_Version() { Info info = new Info(); - Assert.AreEqual("1.2.7", Info.Version); + Assert.AreEqual("1.2.8", Info.Version); Assert.AreEqual(32, info.SizeOfUInt); Assert.AreEqual(32, info.SizeOfULong); Assert.AreEqual(32, info.SizeOfPointer); diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/LICENSE_1_0.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/LICENSE_1_0.txt index 36b7cd93cdf..36b7cd93cdf 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/LICENSE_1_0.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/LICENSE_1_0.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/readme.txt index 4d8c2dd9324..4d8c2dd9324 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/dotzlib/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/dotzlib/readme.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/gcc_gvmat64/gvmat64.S b/Build/source/libs/zlib/zlib-1.2.8/contrib/gcc_gvmat64/gvmat64.S index 23309fa286e..23309fa286e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/gcc_gvmat64/gvmat64.S +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/gcc_gvmat64/gvmat64.S diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/README b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/README index e75ed132948..e75ed132948 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/README +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/README diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/infback9.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/infback9.c index 7bbe90ced2e..05fb3e33807 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/infback9.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/infback9.c @@ -222,14 +222,13 @@ out_func out; void FAR *out_desc; { struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ + z_const unsigned char FAR *next; /* next input */ unsigned char FAR *put; /* next output */ unsigned have; /* available input */ unsigned long left; /* available output */ inflate_mode mode; /* current inflate mode */ int lastblock; /* true if processing last block */ int wrap; /* true if the window has wrapped */ - unsigned long write; /* window write index */ unsigned char FAR *window; /* allocated sliding window, if needed */ unsigned long hold; /* bit buffer */ unsigned bits; /* bits in bit buffer */ @@ -259,7 +258,6 @@ void FAR *out_desc; strm->msg = Z_NULL; mode = TYPE; lastblock = 0; - write = 0; wrap = 0; window = state->window; next = strm->next_in; diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/infback9.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/infback9.h index 1073c0a38e6..1073c0a38e6 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/infback9.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/infback9.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inffix9.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inffix9.h index ee5671d2df6..ee5671d2df6 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inffix9.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inffix9.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inflate9.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inflate9.h index ee9a79394b6..ee9a79394b6 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inflate9.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inflate9.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inftree9.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inftree9.c index 5a0b3287efb..4a73ad215f5 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inftree9.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inftree9.c @@ -1,5 +1,5 @@ /* inftree9.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2012 Mark Adler + * Copyright (C) 1995-2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate9_copyright[] = - " inflate9 1.2.7 Copyright 1995-2012 Mark Adler "; + " inflate9 1.2.8 Copyright 1995-2013 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -64,7 +64,7 @@ unsigned short FAR *work; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, - 133, 133, 133, 133, 144, 78, 68}; + 133, 133, 133, 133, 144, 72, 78}; static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inftree9.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inftree9.h index 5ab21f0c6d1..5ab21f0c6d1 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/infback9/inftree9.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/infback9/inftree9.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/inflate86/inffas86.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/inflate86/inffas86.c index 7292f67b753..7292f67b753 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/inflate86/inffas86.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/inflate86/inffas86.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/inflate86/inffast.S b/Build/source/libs/zlib/zlib-1.2.8/contrib/inflate86/inffast.S index 2245a2905bd..2245a2905bd 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/inflate86/inffast.S +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/inflate86/inffast.S diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/test.cpp b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/test.cpp index 7d265b3b5c0..7d265b3b5c0 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/test.cpp +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/test.cpp diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/zfstream.cpp b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/zfstream.cpp index d0cd85faaf5..d0cd85faaf5 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/zfstream.cpp +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/zfstream.cpp diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/zfstream.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/zfstream.h index ed79098a3ad..ed79098a3ad 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream/zfstream.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream/zfstream.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream2/zstream.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream2/zstream.h index 43d2332b79b..43d2332b79b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream2/zstream.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream2/zstream.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream2/zstream_test.cpp b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream2/zstream_test.cpp index 6273f62d62a..6273f62d62a 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream2/zstream_test.cpp +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream2/zstream_test.cpp diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/README b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/README index f7b319ab91a..f7b319ab91a 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/README +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/README diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/TODO b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/TODO index 7032f97be04..7032f97be04 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/TODO +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/TODO diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/test.cc b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/test.cc index 94235334f25..94235334f25 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/test.cc +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/test.cc diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/zfstream.cc b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/zfstream.cc index 94eb933444a..94eb933444a 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/zfstream.cc +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/zfstream.cc diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/zfstream.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/zfstream.h index 8574479ae1e..8574479ae1e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/iostream3/zfstream.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/iostream3/zfstream.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/bld_ml64.bat b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/bld_ml64.bat index f74bcef5b48..f74bcef5b48 100755 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/bld_ml64.bat +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/bld_ml64.bat diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/gvmat64.asm b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/gvmat64.asm index c1817f1be96..c1817f1be96 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/gvmat64.asm +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/gvmat64.asm diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/inffas8664.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/inffas8664.c index aa861a33392..aa861a33392 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/inffas8664.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/inffas8664.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/inffasx64.asm b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/inffasx64.asm index 41ec82392ed..41ec82392ed 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/inffasx64.asm +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/inffasx64.asm diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/readme.txt index 652571c7a52..652571c7a52 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx64/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx64/readme.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/bld_ml32.bat b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/bld_ml32.bat index fcf5755e46a..fcf5755e46a 100755 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/bld_ml32.bat +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/bld_ml32.bat diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/inffas32.asm b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/inffas32.asm index cb37a81e4ee..cb37a81e4ee 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/inffas32.asm +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/inffas32.asm diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/match686.asm b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/match686.asm index 69e0eed01de..69e0eed01de 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/match686.asm +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/match686.asm diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/readme.txt index 3f8888679fc..3f8888679fc 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/masmx86/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/masmx86/readme.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/Makefile b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/Makefile index 84eaad20d4f..84eaad20d4f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/Makefile +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/Makefile diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/Makefile.am b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/Makefile.am index d343011ebc3..d343011ebc3 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/Makefile.am +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/Makefile.am diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/MiniZip64_Changes.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/MiniZip64_Changes.txt index 13a1bd91a9b..13a1bd91a9b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/MiniZip64_Changes.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/MiniZip64_Changes.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/MiniZip64_info.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/MiniZip64_info.txt index 57d71524208..57d71524208 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/MiniZip64_info.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/MiniZip64_info.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/configure.ac b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/configure.ac index 6a9af21c317..827a4e05770 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/configure.ac +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([minizip], [1.2.7], [bugzilla.redhat.com]) +AC_INIT([minizip], [1.2.8], [bugzilla.redhat.com]) AC_CONFIG_SRCDIR([minizip.c]) AM_INIT_AUTOMAKE([foreign]) LT_INIT diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/crypt.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/crypt.h index a01d08d9328..1e9e8200b20 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/crypt.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/crypt.h @@ -32,7 +32,7 @@ /*********************************************************************** * Return the next byte in the pseudo-random sequence */ -static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) +static int decrypt_byte(unsigned long* pkeys, const z_crc_t* pcrc_32_tab) { unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an * unpredictable manner on 16-bit systems; not a problem @@ -45,7 +45,7 @@ static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab) /*********************************************************************** * Update the encryption keys with the next byte of plain text */ -static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c) +static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c) { (*(pkeys+0)) = CRC32((*(pkeys+0)), c); (*(pkeys+1)) += (*(pkeys+0)) & 0xff; @@ -62,7 +62,7 @@ static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int * Initialize the encryption keys and the random header according to * the given password. */ -static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab) +static void init_keys(const char* passwd,unsigned long* pkeys,const z_crc_t* pcrc_32_tab) { *(pkeys+0) = 305419896L; *(pkeys+1) = 591751049L; @@ -91,7 +91,7 @@ static int crypthead(const char* passwd, /* password string */ unsigned char* buf, /* where to write header */ int bufSize, unsigned long* pkeys, - const unsigned long* pcrc_32_tab, + const z_crc_t* pcrc_32_tab, unsigned long crcForCrypting) { int n; /* index in random header */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/ioapi.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/ioapi.c index 7f5c191b2af..7f5c191b2af 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/ioapi.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/ioapi.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/ioapi.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/ioapi.h index 8dcbdb06e35..8dcbdb06e35 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/ioapi.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/ioapi.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/iowin32.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/iowin32.c index 6a2a883be72..a46d96c7fdd 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/iowin32.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/iowin32.c @@ -25,6 +25,13 @@ #define INVALID_SET_FILE_POINTER ((DWORD)-1) #endif + +#if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API))) +#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP) +#define IOWIN32_USING_WINRT_API 1 +#endif +#endif + voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode)); uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); @@ -93,8 +100,22 @@ voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); +#ifdef IOWIN32_USING_WINRT_API +#ifdef UNICODE + if ((filename!=NULL) && (dwDesiredAccess != 0)) + hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); +#else + if ((filename!=NULL) && (dwDesiredAccess != 0)) + { + WCHAR filenameW[FILENAME_MAX + 0x200 + 1]; + MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200); + hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); + } +#endif +#else if ((filename!=NULL) && (dwDesiredAccess != 0)) hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); +#endif return win32_build_iowin(hFile); } @@ -108,8 +129,17 @@ voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); +#ifdef IOWIN32_USING_WINRT_API + if ((filename!=NULL) && (dwDesiredAccess != 0)) + { + WCHAR filenameW[FILENAME_MAX + 0x200 + 1]; + MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200); + hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); + } +#else if ((filename!=NULL) && (dwDesiredAccess != 0)) hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); +#endif return win32_build_iowin(hFile); } @@ -123,8 +153,13 @@ voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); +#ifdef IOWIN32_USING_WINRT_API + if ((filename!=NULL) && (dwDesiredAccess != 0)) + hFile = CreateFile2((LPCWSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition,NULL); +#else if ((filename!=NULL) && (dwDesiredAccess != 0)) hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); +#endif return win32_build_iowin(hFile); } @@ -138,8 +173,22 @@ voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mo win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); +#ifdef IOWIN32_USING_WINRT_API +#ifdef UNICODE + if ((filename!=NULL) && (dwDesiredAccess != 0)) + hFile = CreateFile2((LPCTSTR)filename, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); +#else + if ((filename!=NULL) && (dwDesiredAccess != 0)) + { + WCHAR filenameW[FILENAME_MAX + 0x200 + 1]; + MultiByteToWideChar(CP_ACP,0,(const char*)filename,-1,filenameW,FILENAME_MAX + 0x200); + hFile = CreateFile2(filenameW, dwDesiredAccess, dwShareMode, dwCreationDisposition, NULL); + } +#endif +#else if ((filename!=NULL) && (dwDesiredAccess != 0)) hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); +#endif return win32_build_iowin(hFile); } @@ -188,6 +237,26 @@ uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* b return ret; } +static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos, DWORD dwMoveMethod) +{ +#ifdef IOWIN32_USING_WINRT_API + return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod); +#else + LONG lHigh = pos.HighPart; + DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT); + BOOL fOk = TRUE; + if (dwNewPos == 0xFFFFFFFF) + if (GetLastError() != NO_ERROR) + fOk = FALSE; + if ((newPos != NULL) && (fOk)) + { + newPos->LowPart = dwNewPos; + newPos->HighPart = lHigh; + } + return fOk; +#endif +} + long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream) { long ret=-1; @@ -196,15 +265,17 @@ long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream) hFile = ((WIN32FILE_IOWIN*)stream) -> hf; if (hFile != NULL) { - DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); - if (dwSet == INVALID_SET_FILE_POINTER) + LARGE_INTEGER pos; + pos.QuadPart = 0; + + if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT)) { DWORD dwErr = GetLastError(); ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; ret = -1; } else - ret=(long)dwSet; + ret=(long)pos.LowPart; } return ret; } @@ -218,17 +289,17 @@ ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream) if (hFile) { - LARGE_INTEGER li; - li.QuadPart = 0; - li.u.LowPart = SetFilePointer(hFile, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); - if ( (li.LowPart == 0xFFFFFFFF) && (GetLastError() != NO_ERROR)) + LARGE_INTEGER pos; + pos.QuadPart = 0; + + if (!MySetFilePointerEx(hFile, pos, &pos, FILE_CURRENT)) { DWORD dwErr = GetLastError(); ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; ret = (ZPOS64_T)-1; } else - ret=li.QuadPart; + ret=pos.QuadPart; } return ret; } @@ -258,8 +329,9 @@ long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,in if (hFile != NULL) { - DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod); - if (dwSet == INVALID_SET_FILE_POINTER) + LARGE_INTEGER pos; + pos.QuadPart = offset; + if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod)) { DWORD dwErr = GetLastError(); ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; @@ -296,9 +368,9 @@ long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T off if (hFile) { - LARGE_INTEGER* li = (LARGE_INTEGER*)&offset; - DWORD dwSet = SetFilePointer(hFile, li->u.LowPart, &li->u.HighPart, dwMoveMethod); - if (dwSet == INVALID_SET_FILE_POINTER) + LARGE_INTEGER pos; + pos.QuadPart = offset; + if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT)) { DWORD dwErr = GetLastError(); ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/iowin32.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/iowin32.h index 0ca0969a7d0..0ca0969a7d0 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/iowin32.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/iowin32.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/make_vms.com b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/make_vms.com index 9ac13a98fa5..9ac13a98fa5 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/make_vms.com +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/make_vms.com diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/miniunz.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/miniunz.c index 3d65401be5c..3d65401be5c 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/miniunz.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/miniunz.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/minizip.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/minizip.c index 4288962ecef..4288962ecef 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/minizip.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/minizip.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/minizip.pc.in b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/minizip.pc.in index 69b5b7fdcb3..69b5b7fdcb3 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/minizip.pc.in +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/minizip.pc.in diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/mztools.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/mztools.c index 96891c2e0b7..96891c2e0b7 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/mztools.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/mztools.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/mztools.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/mztools.h index a49a426ec2f..a49a426ec2f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/mztools.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/mztools.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/unzip.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/unzip.c index affad4bfeb2..909350435a5 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/unzip.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/unzip.c @@ -188,7 +188,7 @@ typedef struct # ifndef NOUNCRYPT unsigned long keys[3]; /* keys defining the pseudo-random sequence */ - const unsigned long* pcrc_32_tab; + const z_crc_t* pcrc_32_tab; # endif } unz64_s; @@ -801,9 +801,9 @@ extern unzFile ZEXPORT unzOpen64 (const void *path) } /* - Close a ZipFile opened with unzipOpen. - If there is files inside the .Zip opened with unzipOpenCurrentFile (see later), - these files MUST be closed with unzipCloseCurrentFile before call unzipClose. + Close a ZipFile opened with unzOpen. + If there is files inside the .Zip opened with unzOpenCurrentFile (see later), + these files MUST be closed with unzCloseCurrentFile before call unzClose. return UNZ_OK if there is no problem. */ extern int ZEXPORT unzClose (unzFile file) { @@ -1223,7 +1223,7 @@ extern int ZEXPORT unzGoToNextFile (unzFile file) /* Try locate the file szFileName in the zipfile. - For the iCaseSensitivity signification, see unzipStringFileNameCompare + For the iCaseSensitivity signification, see unzStringFileNameCompare return value : UNZ_OK if the file is found. It becomes the current file. @@ -1998,7 +1998,7 @@ extern int ZEXPORT unzGetLocalExtrafield (unzFile file, voidp buf, unsigned len) } /* - Close the file in zip opened with unzipOpenCurrentFile + Close the file in zip opened with unzOpenCurrentFile Return UNZ_CRCERROR if all the file was read but the CRC is not good */ extern int ZEXPORT unzCloseCurrentFile (unzFile file) diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/unzip.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/unzip.h index 3183968b771..2104e391507 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/unzip.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/unzip.h @@ -197,9 +197,9 @@ extern unzFile ZEXPORT unzOpen2_64 OF((const void *path, extern int ZEXPORT unzClose OF((unzFile file)); /* - Close a ZipFile opened with unzipOpen. + Close a ZipFile opened with unzOpen. If there is files inside the .Zip opened with unzOpenCurrentFile (see later), - these files MUST be closed with unzipCloseCurrentFile before call unzipClose. + these files MUST be closed with unzCloseCurrentFile before call unzClose. return UNZ_OK if there is no problem. */ extern int ZEXPORT unzGetGlobalInfo OF((unzFile file, diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/zip.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/zip.c index 147934c75d3..ea54853e858 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/zip.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/zip.c @@ -157,7 +157,7 @@ typedef struct ZPOS64_T totalUncompressedData; #ifndef NOCRYPT unsigned long keys[3]; /* keys defining the pseudo-random sequence */ - const unsigned long* pcrc_32_tab; + const z_crc_t* pcrc_32_tab; int crypt_header_size; #endif } curfile64_info; diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/zip.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/zip.h index 8aaebb62343..8aaebb62343 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/minizip/zip.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/minizip/zip.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/example.pas b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/example.pas index 5518b36a730..5518b36a730 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/example.pas +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/example.pas diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/readme.txt index 60e87c8a331..60e87c8a331 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/readme.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/zlibd32.mak b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/zlibd32.mak index 9bb00b7cc42..9bb00b7cc42 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/zlibd32.mak +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/zlibd32.mak diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/zlibpas.pas b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/zlibpas.pas index 7abd862ae66..e6a0782b48c 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/pascal/zlibpas.pas +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/pascal/zlibpas.pas @@ -10,8 +10,8 @@ unit zlibpas; interface const - ZLIB_VERSION = '1.2.7'; - ZLIB_VERNUM = $1270; + ZLIB_VERSION = '1.2.8'; + ZLIB_VERNUM = $1280; type alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/Makefile b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/Makefile index 0e2594c8088..0e2594c8088 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/Makefile +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/Makefile diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/README b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/README index bbc4cb595ec..bbc4cb595ec 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/README +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/README diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/puff.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/puff.c index df8470c9373..ba58483d570 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/puff.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/puff.c @@ -1,8 +1,8 @@ /* * puff.c - * Copyright (C) 2002-2010 Mark Adler + * Copyright (C) 2002-2013 Mark Adler * For conditions of distribution and use, see copyright notice in puff.h - * version 2.2, 25 Apr 2010 + * version 2.3, 21 Jan 2013 * * puff.c is a simple inflate written to be an unambiguous way to specify the * deflate format. It is not written for speed but rather simplicity. As a @@ -76,6 +76,7 @@ * - Move NIL to puff.h * - Allow incomplete code only if single code length is 1 * - Add full code coverage test to Makefile + * 2.3 21 Jan 2013 - Check for invalid code length codes in dynamic blocks */ #include <setjmp.h> /* for setjmp(), longjmp(), and jmp_buf */ @@ -704,6 +705,8 @@ local int dynamic(struct state *s) int len; /* last length to repeat */ symbol = decode(s, &lencode); + if (symbol < 0) + return symbol; /* invalid symbol */ if (symbol < 16) /* length in 0..15 */ lengths[index++] = symbol; else { /* repeat instruction */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/puff.h b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/puff.h index 6a0080ae1a7..e23a2454316 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/puff.h +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/puff.h @@ -1,6 +1,6 @@ /* puff.h - Copyright (C) 2002-2010 Mark Adler, all rights reserved - version 2.2, 25 Apr 2010 + Copyright (C) 2002-2013 Mark Adler, all rights reserved + version 2.3, 21 Jan 2013 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/pufftest.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/pufftest.c index 76e35f66bf6..776481488c9 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/pufftest.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/pufftest.c @@ -1,8 +1,8 @@ /* * pufftest.c - * Copyright (C) 2002-2010 Mark Adler + * Copyright (C) 2002-2013 Mark Adler * For conditions of distribution and use, see copyright notice in puff.h - * version 2.2, 25 Apr 2010 + * version 2.3, 21 Jan 2013 */ /* Example of how to use puff(). diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/zeros.raw b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/zeros.raw Binary files differindex 0a90e76b300..0a90e76b300 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/puff/zeros.raw +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/puff/zeros.raw diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/testzlib/testzlib.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/testzlib/testzlib.c index f559a36461a..8626c92ad17 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/testzlib/testzlib.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/testzlib/testzlib.c @@ -116,10 +116,10 @@ DWORD GetMsecSincePerfCounter(LARGE_INTEGER beginTime64,BOOL fComputeTimeQueryPe return dwRet; } -int ReadFileMemory(const char* filename,long* plFileSize,void** pFilePtr) +int ReadFileMemory(const char* filename,long* plFileSize,unsigned char** pFilePtr) { FILE* stream; - void* ptr; + unsigned char* ptr; int retVal=1; stream=fopen(filename, "rb"); if (stream==NULL) diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/testzlib/testzlib.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/testzlib/testzlib.txt index ba1bb3db64a..ba1bb3db64a 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/testzlib/testzlib.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/testzlib/testzlib.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/Makefile b/Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/Makefile index b54266fba20..b54266fba20 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/Makefile +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/Makefile diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/Makefile.msc b/Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/Makefile.msc index 77b86022137..77b86022137 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/Makefile.msc +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/Makefile.msc diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/untgz.c b/Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/untgz.c index 2c391e59867..2c391e59867 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/untgz/untgz.c +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/untgz/untgz.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/readme.txt b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/readme.txt index 9c46c6f5026..04b8baac8ce 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/readme.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/readme.txt @@ -1,4 +1,4 @@ -Building instructions for the DLL versions of Zlib 1.2.7 +Building instructions for the DLL versions of Zlib 1.2.8 ======================================================== This directory contains projects that build zlib and minizip using @@ -28,6 +28,11 @@ Build instructions for Visual Studio 2010 (32 bits or 64 bits) - Uncompress current zlib, including all contrib/* files - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010 +Build instructions for Visual Studio 2012 (32 bits or 64 bits) +-------------------------------------------------------------- +- Uncompress current zlib, including all contrib/* files +- Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012 + Important --------- diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj index 1b3624215a2..1b3624215a2 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj.filters b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj.filters index 0bd12210cac..0bd12210cac 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/miniunz.vcxproj.filters +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/miniunz.vcxproj.filters diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj index ccd3651df6e..ccd3651df6e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj.filters b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj.filters index 7076d76ff63..7076d76ff63 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/minizip.vcxproj.filters +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/minizip.vcxproj.filters diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj index 476b8ea453e..476b8ea453e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj.filters b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj.filters index 32764910392..32764910392 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlib.vcxproj.filters +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlib.vcxproj.filters diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj index 8e38876fa38..8e38876fa38 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj.filters index ab87f09f47a..ab87f09f47a 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/testzlibdll.vcxproj.filters +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/testzlibdll.vcxproj.filters diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlib.rc b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlib.rc index 3de60c5f3cc..d42f191d37d 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlib.rc +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE - FILEVERSION 1.2.7,0 - PRODUCTVERSION 1.2.7,0 + FILEVERSION 1,2,8,0 + PRODUCTVERSION 1,2,8,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_DOS_WINDOWS32 @@ -17,12 +17,12 @@ BEGIN BEGIN VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" - VALUE "FileVersion", "1.2.7\0" + VALUE "FileVersion", "1.2.8\0" VALUE "InternalName", "zlib\0" - VALUE "OriginalFilename", "zlib.dll\0" + VALUE "OriginalFilename", "zlibwapi.dll\0" VALUE "ProductName", "ZLib.DLL\0" VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" - VALUE "LegalCopyright", "(C) 1995-2012 Jean-loup Gailly & Mark Adler\0" + VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" END END BLOCK "VarFileInfo" diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj index 93820211be6..45389a35215 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj @@ -182,6 +182,10 @@ <OutputFile>$(OutDir)zlibstat.lib</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> </Lib> + <PreBuildEvent> + <Command>cd ..\..\masmx86 +bld_ml32.bat</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> @@ -210,6 +214,10 @@ <OutputFile>$(OutDir)zlibstat.lib</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> </Lib> + <PreBuildEvent> + <Command>cd ..\..\masmx86 +bld_ml32.bat</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> <ClCompile> @@ -266,6 +274,10 @@ <OutputFile>$(OutDir)zlibstat.lib</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> </Lib> + <PreBuildEvent> + <Command>cd ..\..\masmx64 +bld_ml64.bat</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> <Midl> @@ -326,6 +338,10 @@ <OutputFile>$(OutDir)zlibstat.lib</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> </Lib> + <PreBuildEvent> + <Command>cd ..\..\masmx64 +bld_ml64.bat</Command> + </PreBuildEvent> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> <Midl> diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj.filters index 0c8b2501cc8..0c8b2501cc8 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibstat.vcxproj.filters +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibstat.vcxproj.filters diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.def b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.def index 8bd5d99a55b..980fed3a48f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.def +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.def @@ -1,7 +1,7 @@ LIBRARY ; zlib data compression and ZIP file I/O library -VERSION 1.2.7 +VERSION 1.2.8 EXPORTS adler32 @1 @@ -137,3 +137,7 @@ EXPORTS ; zlib1 v1.2.7 added: gzopen_w @165 + +; zlib1 v1.2.8 added: + inflateGetDictionary @166 + gzvprintf @167 diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.sln b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.sln index 649f40c7ea0..649f40c7ea0 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.sln +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.sln diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj index 643047280c3..7d7c49a6dd9 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj @@ -180,10 +180,10 @@ <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapid</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName> - <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName> + <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapid</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName> <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName> </PropertyGroup> @@ -220,18 +220,14 @@ <Link> <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> - <MapFileName>$(OutDir)zlibwapi.map</MapFileName> <SubSystem>Windows</SubSystem> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> </Link> <PreBuildEvent> <Command>cd ..\..\masmx86 @@ -272,18 +268,14 @@ bld_ml32.bat</Command> </ResourceCompile> <Link> <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> - <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> - <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> - <MapFileName>$(OutDir)zlibwapi.map</MapFileName> <SubSystem>Windows</SubSystem> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> </Link> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> @@ -321,18 +313,14 @@ bld_ml32.bat</Command> <Link> <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> - <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> - <MapFileName>$(OutDir)zlibwapi.map</MapFileName> <SubSystem>Windows</SubSystem> <RandomizedBaseAddress>false</RandomizedBaseAddress> <DataExecutionPrevention> </DataExecutionPrevention> - <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> </Link> <PreBuildEvent> <Command>cd ..\..\masmx86 @@ -371,19 +359,15 @@ bld_ml32.bat</Command> </ResourceCompile> <Link> <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> <GenerateDebugInformation>true</GenerateDebugInformation> - <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> - <MapFileName>$(OutDir)zlibwapi.map</MapFileName> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> <PreBuildEvent> - <Command>cd ..\..\contrib\masmx64 + <Command>cd ..\..\masmx64 bld_ml64.bat</Command> </PreBuildEvent> </ItemDefinitionGroup> @@ -463,15 +447,11 @@ bld_ml64.bat</Command> <Culture>0x040c</Culture> </ResourceCompile> <Link> - <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> - <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> - <MapFileName>$(OutDir)zlibwapi.map</MapFileName> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> </ItemDefinitionGroup> @@ -554,15 +534,11 @@ bld_ml64.bat</Command> </ResourceCompile> <Link> <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> - <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> <SuppressStartupBanner>true</SuppressStartupBanner> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> - <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> <GenerateMapFile>true</GenerateMapFile> - <MapFileName>$(OutDir)zlibwapi.map</MapFileName> <SubSystem>Windows</SubSystem> - <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> <TargetMachine>MachineX64</TargetMachine> </Link> <PreBuildEvent> diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj.filters index 22786824fca..22786824fca 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc10/zlibvc.vcxproj.filters +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc10/zlibvc.vcxproj.filters diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/miniunz.vcproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/miniunz.vcproj index 038a9e5faf1..038a9e5faf1 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/miniunz.vcproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/miniunz.vcproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/minizip.vcproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/minizip.vcproj index ad402399144..ad402399144 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/minizip.vcproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/minizip.vcproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/testzlib.vcproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/testzlib.vcproj index c9f19d24ef9..c9f19d24ef9 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/testzlib.vcproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/testzlib.vcproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/testzlibdll.vcproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/testzlibdll.vcproj index d7530fd7dcb..d7530fd7dcb 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/testzlibdll.vcproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/testzlibdll.vcproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlib.rc b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlib.rc index 3de60c5f3cc..d42f191d37d 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlib.rc +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1 IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE - FILEVERSION 1.2.7,0 - PRODUCTVERSION 1.2.7,0 + FILEVERSION 1,2,8,0 + PRODUCTVERSION 1,2,8,0 FILEFLAGSMASK VS_FFI_FILEFLAGSMASK FILEFLAGS 0 FILEOS VOS_DOS_WINDOWS32 @@ -17,12 +17,12 @@ BEGIN BEGIN VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0" - VALUE "FileVersion", "1.2.7\0" + VALUE "FileVersion", "1.2.8\0" VALUE "InternalName", "zlib\0" - VALUE "OriginalFilename", "zlib.dll\0" + VALUE "OriginalFilename", "zlibwapi.dll\0" VALUE "ProductName", "ZLib.DLL\0" VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" - VALUE "LegalCopyright", "(C) 1995-2012 Jean-loup Gailly & Mark Adler\0" + VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" END END BLOCK "VarFileInfo" diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibstat.vcproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibstat.vcproj index d4ffb46b245..d4ffb46b245 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibstat.vcproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibstat.vcproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.def b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.def index 8bd5d99a55b..980fed3a48f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.def +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.def @@ -1,7 +1,7 @@ LIBRARY ; zlib data compression and ZIP file I/O library -VERSION 1.2.7 +VERSION 1.2.8 EXPORTS adler32 @1 @@ -137,3 +137,7 @@ EXPORTS ; zlib1 v1.2.7 added: gzopen_w @165 + +; zlib1 v1.2.8 added: + inflateGetDictionary @166 + gzvprintf @167 diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.sln b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.sln index 75c64c3f4ad..75c64c3f4ad 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.sln +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.sln diff --git a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.vcproj b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.vcproj index 95bb241f304..95bb241f304 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/contrib/vstudio/vc9/zlibvc.vcproj +++ b/Build/source/libs/zlib/zlib-1.2.8/contrib/vstudio/vc9/zlibvc.vcproj diff --git a/Build/source/libs/zlib/zlib-1.2.7/crc32.c b/Build/source/libs/zlib/zlib-1.2.8/crc32.c index 979a7190a3c..979a7190a3c 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/crc32.c +++ b/Build/source/libs/zlib/zlib-1.2.8/crc32.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/crc32.h b/Build/source/libs/zlib/zlib-1.2.8/crc32.h index 9e0c7781025..9e0c7781025 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/crc32.h +++ b/Build/source/libs/zlib/zlib-1.2.8/crc32.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/deflate.c b/Build/source/libs/zlib/zlib-1.2.8/deflate.c index 9e4c2cbc8af..696957705b7 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/deflate.c +++ b/Build/source/libs/zlib/zlib-1.2.8/deflate.c @@ -1,5 +1,5 @@ /* deflate.c -- compress data using the deflation algorithm - * Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler + * Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -52,7 +52,7 @@ #include "deflate.h" const char deflate_copyright[] = - " deflate 1.2.7 Copyright 1995-2012 Jean-loup Gailly and Mark Adler "; + " deflate 1.2.8 Copyright 1995-2013 Jean-loup Gailly and Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -305,7 +305,7 @@ int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy, if (s->window == Z_NULL || s->prev == Z_NULL || s->head == Z_NULL || s->pending_buf == Z_NULL) { s->status = FINISH_STATE; - strm->msg = (char*)ERR_MSG(Z_MEM_ERROR); + strm->msg = ERR_MSG(Z_MEM_ERROR); deflateEnd (strm); return Z_MEM_ERROR; } @@ -329,7 +329,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) uInt str, n; int wrap; unsigned avail; - unsigned char *next; + z_const unsigned char *next; if (strm == Z_NULL || strm->state == Z_NULL || dictionary == Z_NULL) return Z_STREAM_ERROR; @@ -359,7 +359,7 @@ int ZEXPORT deflateSetDictionary (strm, dictionary, dictLength) avail = strm->avail_in; next = strm->next_in; strm->avail_in = dictLength; - strm->next_in = (Bytef *)dictionary; + strm->next_in = (z_const Bytef *)dictionary; fill_window(s); while (s->lookahead >= MIN_MATCH) { str = s->strstart; @@ -513,6 +513,8 @@ int ZEXPORT deflateParams(strm, level, strategy) strm->total_in != 0) { /* Flush the last buffer: */ err = deflate(strm, Z_BLOCK); + if (err == Z_BUF_ERROR && s->pending == 0) + err = Z_OK; } if (s->level != level) { s->level = level; diff --git a/Build/source/libs/zlib/zlib-1.2.7/deflate.h b/Build/source/libs/zlib/zlib-1.2.8/deflate.h index fbac44d908e..ce0299edd19 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/deflate.h +++ b/Build/source/libs/zlib/zlib-1.2.8/deflate.h @@ -104,7 +104,7 @@ typedef struct internal_state { int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ gz_headerp gzhead; /* gzip header information to write */ uInt gzindex; /* where in extra, name, or comment */ - Byte method; /* STORED (for zip only) or DEFLATED */ + Byte method; /* can only be DEFLATED */ int last_flush; /* value of flush param for previous deflate call */ /* used by deflate.c: */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/doc/algorithm.txt b/Build/source/libs/zlib/zlib-1.2.8/doc/algorithm.txt index c97f495020b..c97f495020b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/doc/algorithm.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/doc/algorithm.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/doc/txtvsbin.txt b/Build/source/libs/zlib/zlib-1.2.8/doc/txtvsbin.txt index 3d0f0634f72..3d0f0634f72 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/doc/txtvsbin.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/doc/txtvsbin.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/README.examples b/Build/source/libs/zlib/zlib-1.2.8/examples/README.examples index 56a31714e56..56a31714e56 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/README.examples +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/README.examples diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/enough.c b/Build/source/libs/zlib/zlib-1.2.8/examples/enough.c index c40410badef..b9911443052 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/enough.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/enough.c @@ -1,7 +1,7 @@ /* enough.c -- determine the maximum size of inflate's Huffman code tables over * all possible valid and complete Huffman codes, subject to a length limit. - * Copyright (C) 2007, 2008 Mark Adler - * Version 1.3 17 February 2008 Mark Adler + * Copyright (C) 2007, 2008, 2012 Mark Adler + * Version 1.4 18 August 2012 Mark Adler */ /* Version history: @@ -14,6 +14,9 @@ 1.3 17 Feb 2008 Add argument for initial root table size Fix bug for initial root table size == max - 1 Use a macro to compute the history index + 1.4 18 Aug 2012 Avoid shifts more than bits in type (caused endless loop!) + Clean up comparisons of different types + Clean up code indentation */ /* @@ -236,8 +239,8 @@ local big_t count(int syms, int len, int left) for (use = least; use <= most; use++) { got = count(syms - use, len + 1, (left - use) << 1); sum += got; - if (got == -1 || sum < got) /* overflow */ - return -1; + if (got == (big_t)0 - 1 || sum < got) /* overflow */ + return (big_t)0 - 1; } /* verify that all recursive calls are productive */ @@ -458,6 +461,7 @@ int main(int argc, char **argv) int n; /* number of symbols to code for this run */ big_t got; /* return value of count() */ big_t sum; /* accumulated number of codes over n */ + code_t word; /* for counting bits in code_t */ /* set up globals for cleanup() */ code = NULL; @@ -466,19 +470,19 @@ int main(int argc, char **argv) /* get arguments -- default to the deflate literal/length code */ syms = 286; - root = 9; + root = 9; max = 15; if (argc > 1) { syms = atoi(argv[1]); if (argc > 2) { root = atoi(argv[2]); - if (argc > 3) - max = atoi(argv[3]); - } + if (argc > 3) + max = atoi(argv[3]); + } } if (argc > 4 || syms < 2 || root < 1 || max < 1) { fputs("invalid arguments, need: [sym >= 2 [root >= 1 [max >= 1]]]\n", - stderr); + stderr); return 1; } @@ -487,18 +491,17 @@ int main(int argc, char **argv) max = syms - 1; /* determine the number of bits in a code_t */ - n = 0; - while (((code_t)1 << n) != 0) - n++; + for (n = 0, word = 1; word; n++, word <<= 1) + ; /* make sure that the calculation of most will not overflow */ - if (max > n || syms - 2 >= (((code_t)0 - 1) >> (max - 1))) { + if (max > n || (code_t)(syms - 2) >= (((code_t)0 - 1) >> (max - 1))) { fputs("abort: code length too long for internal types\n", stderr); return 1; } /* reject impossible code requests */ - if (syms - 1 > ((code_t)1 << max) - 1) { + if ((code_t)(syms - 1) > ((code_t)1 << max) - 1) { fprintf(stderr, "%d symbols cannot be coded in %d bits\n", syms, max); return 1; @@ -532,7 +535,7 @@ int main(int argc, char **argv) for (n = 2; n <= syms; n++) { got = count(n, 1, 2); sum += got; - if (got == -1 || sum < got) { /* overflow */ + if (got == (big_t)0 - 1 || sum < got) { /* overflow */ fputs("abort: can't count that high!\n", stderr); cleanup(); return 1; @@ -556,9 +559,9 @@ int main(int argc, char **argv) } /* find and show maximum inflate table usage */ - if (root > max) /* reduce root to max length */ - root = max; - if (syms < ((code_t)1 << (root + 1))) + if (root > max) /* reduce root to max length */ + root = max; + if ((code_t)syms < ((code_t)1 << (root + 1))) enough(syms); else puts("cannot handle minimum code lengths > root"); diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/fitblk.c b/Build/source/libs/zlib/zlib-1.2.8/examples/fitblk.c index c61de5c9967..c61de5c9967 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/fitblk.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/fitblk.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/gun.c b/Build/source/libs/zlib/zlib-1.2.8/examples/gun.c index 72b0882ab86..89e484fee60 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/gun.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/gun.c @@ -1,7 +1,7 @@ /* gun.c -- simple gunzip to give an example of the use of inflateBack() - * Copyright (C) 2003, 2005, 2008, 2010 Mark Adler + * Copyright (C) 2003, 2005, 2008, 2010, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h - Version 1.6 17 January 2010 Mark Adler */ + Version 1.7 12 August 2012 Mark Adler */ /* Version history: 1.0 16 Feb 2003 First version for testing of inflateBack() @@ -18,6 +18,7 @@ 1.4 8 Dec 2006 LZW decompression speed improvements 1.5 9 Feb 2008 Avoid warning in latest version of gcc 1.6 17 Jan 2010 Avoid signed/unsigned comparison warnings + 1.7 12 Aug 2012 Update for z_const usage in zlib 1.2.8 */ /* @@ -85,7 +86,7 @@ struct ind { /* Load input buffer, assumed to be empty, and return bytes loaded and a pointer to them. read() is called until the buffer is full, or until it returns end-of-file or error. Return 0 on error. */ -local unsigned in(void *in_desc, unsigned char **buf) +local unsigned in(void *in_desc, z_const unsigned char **buf) { int ret; unsigned len; @@ -196,7 +197,7 @@ unsigned char match[65280 + 2]; /* buffer for reversed match or gzip file, read error, or write error (a write error indicated by strm->next_in not equal to Z_NULL), or Z_DATA_ERROR for invalid input. */ -local int lunpipe(unsigned have, unsigned char *next, struct ind *indp, +local int lunpipe(unsigned have, z_const unsigned char *next, struct ind *indp, int outfile, z_stream *strm) { int last; /* last byte read by NEXT(), or -1 if EOF */ @@ -383,7 +384,7 @@ local int gunpipe(z_stream *strm, int infile, int outfile) { int ret, first, last; unsigned have, flags, len; - unsigned char *next = NULL; + z_const unsigned char *next = NULL; struct ind ind, *indp; struct outd outd; diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/gzappend.c b/Build/source/libs/zlib/zlib-1.2.8/examples/gzappend.c index e9e878e1160..662dec3794b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/gzappend.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/gzappend.c @@ -1,7 +1,7 @@ /* gzappend -- command to append to a gzip file - Copyright (C) 2003 Mark Adler, all rights reserved - version 1.1, 4 Nov 2003 + Copyright (C) 2003, 2012 Mark Adler, all rights reserved + version 1.2, 11 Oct 2012 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -39,6 +39,8 @@ * - Keep gzip file clean on appended file read errors * - Use in-place rotate instead of auxiliary buffer * (Why you ask? Because it was fun to write!) + * 1.2 11 Oct 2012 - Fix for proper z_const usage + * - Check for input buffer malloc failure */ /* @@ -170,7 +172,7 @@ typedef struct { int size; /* 1 << size is bytes in buf */ unsigned left; /* bytes available at next */ unsigned char *buf; /* buffer */ - unsigned char *next; /* next byte in buffer */ + z_const unsigned char *next; /* next byte in buffer */ char *name; /* file name for error messages */ } file; @@ -399,14 +401,14 @@ local void gztack(char *name, int gd, z_stream *strm, int last) } /* allocate buffers */ - in = fd == -1 ? NULL : malloc(CHUNK); + in = malloc(CHUNK); out = malloc(CHUNK); - if (out == NULL) bye("out of memory", ""); + if (in == NULL || out == NULL) bye("out of memory", ""); /* compress input file and append to gzip file */ do { /* get more input */ - len = fd == -1 ? 0 : read(fd, in, CHUNK); + len = read(fd, in, CHUNK); if (len == -1) { fprintf(stderr, "gzappend warning: error reading %s, skipping rest ...\n", @@ -453,7 +455,7 @@ local void gztack(char *name, int gd, z_stream *strm, int last) /* clean up and return */ free(out); - if (in != NULL) free(in); + free(in); if (fd > 0) close(fd); } @@ -467,11 +469,13 @@ int main(int argc, char **argv) z_stream strm; /* ignore command name */ - argv++; + argc--; argv++; /* provide usage if no arguments */ if (*argv == NULL) { - printf("gzappend 1.1 (4 Nov 2003) Copyright (C) 2003 Mark Adler\n"); + printf( + "gzappend 1.2 (11 Oct 2012) Copyright (C) 2003, 2012 Mark Adler\n" + ); printf( "usage: gzappend [-level] file.gz [ addthis [ andthis ... ]]\n"); return 0; diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/gzjoin.c b/Build/source/libs/zlib/zlib-1.2.8/examples/gzjoin.c index 129347ce3ca..89e8098441b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/gzjoin.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/gzjoin.c @@ -1,7 +1,7 @@ /* gzjoin -- command to join gzip files into one gzip file - Copyright (C) 2004 Mark Adler, all rights reserved - version 1.0, 11 Dec 2004 + Copyright (C) 2004, 2005, 2012 Mark Adler, all rights reserved + version 1.2, 14 Aug 2012 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -27,6 +27,7 @@ * * 1.0 11 Dec 2004 - First version * 1.1 12 Jun 2005 - Changed ssize_t to long for portability + * 1.2 14 Aug 2012 - Clean up for z_const usage */ /* @@ -308,7 +309,7 @@ local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot, /* inflate and copy compressed data, clear last-block bit if requested */ len = 0; zpull(&strm, in); - start = strm.next_in; + start = in->next; last = start[0] & 1; if (last && clr) start[0] &= ~1; @@ -351,7 +352,7 @@ local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot, pos = 0x100 >> pos; last = strm.next_in[-1] & pos; if (last && clr) - strm.next_in[-1] &= ~pos; + in->buf[strm.next_in - in->buf - 1] &= ~pos; } else { /* next last-block bit is in next unused byte */ @@ -364,14 +365,14 @@ local void gzcopy(char *name, int clr, unsigned long *crc, unsigned long *tot, } last = strm.next_in[0] & 1; if (last && clr) - strm.next_in[0] &= ~1; + in->buf[strm.next_in - in->buf] &= ~1; } } } /* update buffer with unused input */ in->left = strm.avail_in; - in->next = strm.next_in; + in->next = in->buf + (strm.next_in - in->buf); /* copy used input, write empty blocks to get to byte boundary */ pos = strm.data_type & 7; diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/gzlog.c b/Build/source/libs/zlib/zlib-1.2.8/examples/gzlog.c index d70aacabaeb..922f878dde3 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/gzlog.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/gzlog.c @@ -1,8 +1,8 @@ /* * gzlog.c - * Copyright (C) 2004, 2008 Mark Adler, all rights reserved + * Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved * For conditions of distribution and use, see copyright notice in gzlog.h - * version 2.0, 25 Apr 2008 + * version 2.2, 14 Aug 2012 */ /* @@ -750,7 +750,8 @@ local int log_recover(struct log *log, int op) strcpy(log->end, ".add"); if (stat(log->path, &st) == 0 && st.st_size) { len = (size_t)(st.st_size); - if (len != st.st_size || (data = malloc(st.st_size)) == NULL) { + if ((off_t)len != st.st_size || + (data = malloc(st.st_size)) == NULL) { log_log(log, op, "allocation failure"); return -2; } @@ -758,7 +759,7 @@ local int log_recover(struct log *log, int op) log_log(log, op, ".add file read failure"); return -1; } - ret = read(fd, data, len) != len; + ret = (size_t)read(fd, data, len) != len; close(fd); if (ret) { log_log(log, op, ".add file read failure"); @@ -913,7 +914,7 @@ int gzlog_compress(gzlog *logd) struct log *log = logd; /* check arguments */ - if (log == NULL || strcmp(log->id, LOGID) || len < 0) + if (log == NULL || strcmp(log->id, LOGID)) return -3; /* see if we lost the lock -- if so get it again and reload the extra @@ -952,7 +953,7 @@ int gzlog_compress(gzlog *logd) fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (fd < 0) break; - ret = write(fd, data, len) != len; + ret = (size_t)write(fd, data, len) != len; if (ret | close(fd)) break; log_touch(log); @@ -963,7 +964,7 @@ int gzlog_compress(gzlog *logd) if (fd < 0) break; next = DICT > len ? len : DICT; - ret = write(fd, (char *)data + len - next, next) != next; + ret = (size_t)write(fd, (char *)data + len - next, next) != next; if (ret | close(fd)) break; log_touch(log); @@ -997,9 +998,9 @@ int gzlog_write(gzlog *logd, void *data, size_t len) struct log *log = logd; /* check arguments */ - if (log == NULL || strcmp(log->id, LOGID) || len < 0) + if (log == NULL || strcmp(log->id, LOGID)) return -3; - if (data == NULL || len == 0) + if (data == NULL || len <= 0) return 0; /* see if we lost the lock -- if so get it again and reload the extra @@ -1013,7 +1014,7 @@ int gzlog_write(gzlog *logd, void *data, size_t len) fd = open(log->path, O_WRONLY | O_CREAT | O_TRUNC, 0644); if (fd < 0) return -1; - ret = write(fd, data, len) != len; + ret = (size_t)write(fd, data, len) != len; if (ret | close(fd)) return -1; log_touch(log); diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/gzlog.h b/Build/source/libs/zlib/zlib-1.2.8/examples/gzlog.h index c46142673db..86f0cecba5b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/gzlog.h +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/gzlog.h @@ -1,6 +1,6 @@ /* gzlog.h - Copyright (C) 2004, 2008 Mark Adler, all rights reserved - version 2.0, 25 Apr 2008 + Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved + version 2.2, 14 Aug 2012 This software is provided 'as-is', without any express or implied warranty. In no event will the author be held liable for any damages @@ -27,6 +27,8 @@ Interface changed slightly in that now path is a prefix Compression now occurs as needed during gzlog_write() gzlog_write() now always leaves the log file as valid gzip + 2.1 8 Jul 2012 Fix argument checks in gzlog_compress() and gzlog_write() + 2.2 14 Aug 2012 Clean up signed comparisons */ /* diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/zlib_how.html b/Build/source/libs/zlib/zlib-1.2.8/examples/zlib_how.html index 444ff1c9a32..444ff1c9a32 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/zlib_how.html +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/zlib_how.html diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/zpipe.c b/Build/source/libs/zlib/zlib-1.2.8/examples/zpipe.c index 83535d16935..83535d16935 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/zpipe.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/zpipe.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/examples/zran.c b/Build/source/libs/zlib/zlib-1.2.8/examples/zran.c index 617a13086fa..278f9ad07d2 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/examples/zran.c +++ b/Build/source/libs/zlib/zlib-1.2.8/examples/zran.c @@ -1,7 +1,12 @@ /* zran.c -- example of zlib/gzip stream indexing and random access - * Copyright (C) 2005 Mark Adler + * Copyright (C) 2005, 2012 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h - Version 1.0 29 May 2005 Mark Adler */ + Version 1.1 29 Sep 2012 Mark Adler */ + +/* Version History: + 1.0 29 May 2005 First version + 1.1 29 Sep 2012 Fix memory reallocation error + */ /* Illustrate the use of Z_BLOCK, inflatePrime(), and inflateSetDictionary() for random access of a compressed file. A file containing a zlib or gzip @@ -221,7 +226,7 @@ local int build_index(FILE *in, off_t span, struct access **built) /* clean up and return index (release unused entries in list) */ (void)inflateEnd(&strm); - index = realloc(index, sizeof(struct point) * index->have); + index->list = realloc(index->list, sizeof(struct point) * index->have); index->size = index->have; *built = index; return index->size; diff --git a/Build/source/libs/zlib/zlib-1.2.7/gzclose.c b/Build/source/libs/zlib/zlib-1.2.8/gzclose.c index caeb99a3177..caeb99a3177 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/gzclose.c +++ b/Build/source/libs/zlib/zlib-1.2.8/gzclose.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/gzguts.h b/Build/source/libs/zlib/zlib-1.2.8/gzguts.h index ee3f281aa57..d87659d0319 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/gzguts.h +++ b/Build/source/libs/zlib/zlib-1.2.8/gzguts.h @@ -1,5 +1,5 @@ /* gzguts.h -- zlib internal header definitions for gz* operations - * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -35,6 +35,13 @@ # include <io.h> #endif +#ifdef WINAPI_FAMILY +# define open _open +# define read _read +# define write _write +# define close _close +#endif + #ifdef NO_DEFLATE /* for compatibility with old definition */ # define NO_GZCOMPRESS #endif @@ -60,7 +67,7 @@ #ifndef HAVE_VSNPRINTF # ifdef MSDOS /* vsnprintf may exist on some MS-DOS compilers (DJGPP?), - but for now we just assume it doesn't. */ + but for now we just assume it doesn't. */ # define NO_vsnprintf # endif # ifdef __TURBOC__ @@ -88,6 +95,14 @@ # endif #endif +/* unlike snprintf (which is required in C99, yet still not supported by + Microsoft more than a decade later!), _snprintf does not guarantee null + termination of the result -- however this is only used in gzlib.c where + the result is assured to fit in the space provided */ +#ifdef _MSC_VER +# define snprintf _snprintf +#endif + #ifndef local # define local static #endif @@ -127,7 +142,8 @@ # define DEF_MEM_LEVEL MAX_MEM_LEVEL #endif -/* default i/o buffer size -- double this for output when reading */ +/* default i/o buffer size -- double this for output when reading (this and + twice this must be able to fit in an unsigned type) */ #define GZBUFSIZE 8192 /* gzip modes, also provide a little integrity check on the passed structure */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/gzlib.c b/Build/source/libs/zlib/zlib-1.2.8/gzlib.c index ca55c6ea926..fae202ef890 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/gzlib.c +++ b/Build/source/libs/zlib/zlib-1.2.8/gzlib.c @@ -1,5 +1,5 @@ /* gzlib.c -- zlib functions common to reading and writing gzip files - * Copyright (C) 2004, 2010, 2011, 2012 Mark Adler + * Copyright (C) 2004, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -108,7 +108,7 @@ local gzFile gz_open(path, fd, mode) return NULL; /* allocate gzFile structure to return */ - state = malloc(sizeof(gz_state)); + state = (gz_statep)malloc(sizeof(gz_state)); if (state == NULL) return NULL; state->size = 0; /* no buffers allocated yet */ @@ -162,8 +162,10 @@ local gzFile gz_open(path, fd, mode) break; case 'F': state->strategy = Z_FIXED; + break; case 'T': state->direct = 1; + break; default: /* could consider as an error, but just ignore */ ; } @@ -194,8 +196,8 @@ local gzFile gz_open(path, fd, mode) } else #endif - len = strlen(path); - state->path = malloc(len + 1); + len = strlen((const char *)path); + state->path = (char *)malloc(len + 1); if (state->path == NULL) { free(state); return NULL; @@ -208,7 +210,11 @@ local gzFile gz_open(path, fd, mode) *(state->path) = 0; else #endif +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(state->path, len + 1, "%s", (const char *)path); +#else strcpy(state->path, path); +#endif /* compute the flags for open() */ oflag = @@ -236,7 +242,7 @@ local gzFile gz_open(path, fd, mode) #ifdef _WIN32 fd == -2 ? _wopen(path, oflag, 0666) : #endif - open(path, oflag, 0666)); + open((const char *)path, oflag, 0666)); if (state->fd == -1) { free(state->path); free(state); @@ -282,9 +288,13 @@ gzFile ZEXPORT gzdopen(fd, mode) char *path; /* identifier for error messages */ gzFile gz; - if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL) + if (fd == -1 || (path = (char *)malloc(7 + 3 * sizeof(int))) == NULL) return NULL; +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(path, 7 + 3 * sizeof(int), "<fd:%d>", fd); /* for debugging */ +#else sprintf(path, "<fd:%d>", fd); /* for debugging */ +#endif gz = gz_open(path, fd, mode); free(path); return gz; @@ -531,7 +541,8 @@ const char * ZEXPORT gzerror(file, errnum) /* return error information */ if (errnum != NULL) *errnum = state->err; - return state->msg == NULL ? "" : state->msg; + return state->err == Z_MEM_ERROR ? "out of memory" : + (state->msg == NULL ? "" : state->msg); } /* -- see zlib.h -- */ @@ -582,21 +593,24 @@ void ZLIB_INTERNAL gz_error(state, err, msg) if (msg == NULL) return; - /* for an out of memory error, save as static string */ - if (err == Z_MEM_ERROR) { - state->msg = (char *)msg; + /* for an out of memory error, return literal string when requested */ + if (err == Z_MEM_ERROR) return; - } /* construct error message with path */ - if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) { + if ((state->msg = (char *)malloc(strlen(state->path) + strlen(msg) + 3)) == + NULL) { state->err = Z_MEM_ERROR; - state->msg = (char *)"out of memory"; return; } +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(state->msg, strlen(state->path) + strlen(msg) + 3, + "%s%s%s", state->path, ": ", msg); +#else strcpy(state->msg, state->path); strcat(state->msg, ": "); strcat(state->msg, msg); +#endif return; } diff --git a/Build/source/libs/zlib/zlib-1.2.7/gzread.c b/Build/source/libs/zlib/zlib-1.2.8/gzread.c index 3493d34d4ea..bf4538eb274 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/gzread.c +++ b/Build/source/libs/zlib/zlib-1.2.8/gzread.c @@ -1,5 +1,5 @@ /* gzread.c -- zlib functions for reading gzip files - * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -58,7 +58,8 @@ local int gz_avail(state) return -1; if (state->eof == 0) { if (strm->avail_in) { /* copy what's there to the start */ - unsigned char *p = state->in, *q = strm->next_in; + unsigned char *p = state->in; + unsigned const char *q = strm->next_in; unsigned n = strm->avail_in; do { *p++ = *q++; @@ -90,8 +91,8 @@ local int gz_look(state) /* allocate read buffers and inflate memory */ if (state->size == 0) { /* allocate buffers */ - state->in = malloc(state->want); - state->out = malloc(state->want << 1); + state->in = (unsigned char *)malloc(state->want); + state->out = (unsigned char *)malloc(state->want << 1); if (state->in == NULL || state->out == NULL) { if (state->out != NULL) free(state->out); @@ -352,14 +353,14 @@ int ZEXPORT gzread(file, buf, len) /* large len -- read directly into user buffer */ else if (state->how == COPY) { /* read directly */ - if (gz_load(state, buf, len, &n) == -1) + if (gz_load(state, (unsigned char *)buf, len, &n) == -1) return -1; } /* large len -- decompress directly into user buffer */ else { /* state->how == GZIP */ strm->avail_out = len; - strm->next_out = buf; + strm->next_out = (unsigned char *)buf; if (gz_decomp(state) == -1) return -1; n = state->x.have; @@ -378,7 +379,11 @@ int ZEXPORT gzread(file, buf, len) } /* -- see zlib.h -- */ -#undef gzgetc +#ifdef Z_PREFIX_SET +# undef z_gzgetc +#else +# undef gzgetc +#endif int ZEXPORT gzgetc(file) gzFile file; { @@ -518,7 +523,7 @@ char * ZEXPORT gzgets(file, buf, len) /* look for end-of-line in current output buffer */ n = state->x.have > left ? left : state->x.have; - eol = memchr(state->x.next, '\n', n); + eol = (unsigned char *)memchr(state->x.next, '\n', n); if (eol != NULL) n = (unsigned)(eol - state->x.next) + 1; diff --git a/Build/source/libs/zlib/zlib-1.2.7/gzwrite.c b/Build/source/libs/zlib/zlib-1.2.8/gzwrite.c index 27cb3428e32..aa767fbf63e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/gzwrite.c +++ b/Build/source/libs/zlib/zlib-1.2.8/gzwrite.c @@ -1,5 +1,5 @@ /* gzwrite.c -- zlib functions for writing gzip files - * Copyright (C) 2004, 2005, 2010, 2011, 2012 Mark Adler + * Copyright (C) 2004, 2005, 2010, 2011, 2012, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -19,7 +19,7 @@ local int gz_init(state) z_streamp strm = &(state->strm); /* allocate input buffer */ - state->in = malloc(state->want); + state->in = (unsigned char *)malloc(state->want); if (state->in == NULL) { gz_error(state, Z_MEM_ERROR, "out of memory"); return -1; @@ -28,7 +28,7 @@ local int gz_init(state) /* only need output buffer and deflate state if compressing */ if (!state->direct) { /* allocate output buffer */ - state->out = malloc(state->want); + state->out = (unsigned char *)malloc(state->want); if (state->out == NULL) { free(state->in); gz_error(state, Z_MEM_ERROR, "out of memory"); @@ -168,7 +168,6 @@ int ZEXPORT gzwrite(file, buf, len) unsigned len; { unsigned put = len; - unsigned n; gz_statep state; z_streamp strm; @@ -208,16 +207,19 @@ int ZEXPORT gzwrite(file, buf, len) if (len < state->size) { /* copy to input buffer, compress when full */ do { + unsigned have, copy; + if (strm->avail_in == 0) strm->next_in = state->in; - n = state->size - strm->avail_in; - if (n > len) - n = len; - memcpy(strm->next_in + strm->avail_in, buf, n); - strm->avail_in += n; - state->x.pos += n; - buf = (char *)buf + n; - len -= n; + have = (unsigned)((strm->next_in + strm->avail_in) - state->in); + copy = state->size - have; + if (copy > len) + copy = len; + memcpy(state->in + have, buf, copy); + strm->avail_in += copy; + state->x.pos += copy; + buf = (const char *)buf + copy; + len -= copy; if (len && gz_comp(state, Z_NO_FLUSH) == -1) return 0; } while (len); @@ -229,7 +231,7 @@ int ZEXPORT gzwrite(file, buf, len) /* directly compress user buffer to file */ strm->avail_in = len; - strm->next_in = (voidp)buf; + strm->next_in = (z_const Bytef *)buf; state->x.pos += len; if (gz_comp(state, Z_NO_FLUSH) == -1) return 0; @@ -244,6 +246,7 @@ int ZEXPORT gzputc(file, c) gzFile file; int c; { + unsigned have; unsigned char buf[1]; gz_statep state; z_streamp strm; @@ -267,12 +270,16 @@ int ZEXPORT gzputc(file, c) /* try writing to input buffer for speed (state->size == 0 if buffer not initialized) */ - if (strm->avail_in < state->size) { + if (state->size) { if (strm->avail_in == 0) strm->next_in = state->in; - strm->next_in[strm->avail_in++] = c; - state->x.pos++; - return c & 0xff; + have = (unsigned)((strm->next_in + strm->avail_in) - state->in); + if (have < state->size) { + state->in[have] = c; + strm->avail_in++; + state->x.pos++; + return c & 0xff; + } } /* no room in buffer or not initialized, use gz_write() */ @@ -300,12 +307,11 @@ int ZEXPORT gzputs(file, str) #include <stdarg.h> /* -- see zlib.h -- */ -int ZEXPORTVA gzprintf (gzFile file, const char *format, ...) +int ZEXPORTVA gzvprintf(gzFile file, const char *format, va_list va) { int size, len; gz_statep state; z_streamp strm; - va_list va; /* get internal structure */ if (file == NULL) @@ -335,25 +341,20 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...) /* do the printf() into the input buffer, put length in len */ size = (int)(state->size); state->in[size - 1] = 0; - va_start(va, format); #ifdef NO_vsnprintf # ifdef HAS_vsprintf_void (void)vsprintf((char *)(state->in), format, va); - va_end(va); for (len = 0; len < size; len++) if (state->in[len] == 0) break; # else len = vsprintf((char *)(state->in), format, va); - va_end(va); # endif #else # ifdef HAS_vsnprintf_void (void)vsnprintf((char *)(state->in), size, format, va); - va_end(va); len = strlen((char *)(state->in)); # else len = vsnprintf((char *)(state->in), size, format, va); - va_end(va); # endif #endif @@ -368,6 +369,17 @@ int ZEXPORTVA gzprintf (gzFile file, const char *format, ...) return len; } +int ZEXPORTVA gzprintf(gzFile file, const char *format, ...) +{ + va_list va; + int ret; + + va_start(va, format); + ret = gzvprintf(file, format, va); + va_end(va); + return ret; +} + #else /* !STDC && !Z_HAVE_STDARG_H */ /* -- see zlib.h -- */ @@ -547,9 +559,9 @@ int ZEXPORT gzclose_w(file) } /* flush, free memory, and close file */ + if (gz_comp(state, Z_FINISH) == -1) + ret = state->err; if (state->size) { - if (gz_comp(state, Z_FINISH) == -1) - ret = state->err; if (!state->direct) { (void)deflateEnd(&(state->strm)); free(state->out); diff --git a/Build/source/libs/zlib/zlib-1.2.7/infback.c b/Build/source/libs/zlib/zlib-1.2.8/infback.c index 981aff17c2d..f3833c2e434 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/infback.c +++ b/Build/source/libs/zlib/zlib-1.2.8/infback.c @@ -255,7 +255,7 @@ out_func out; void FAR *out_desc; { struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ + z_const unsigned char FAR *next; /* next input */ unsigned char FAR *put; /* next output */ unsigned have, left; /* available input and output */ unsigned long hold; /* bit buffer */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/inffast.c b/Build/source/libs/zlib/zlib-1.2.8/inffast.c index 2f1d60b43b8..bda59ceb6a1 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/inffast.c +++ b/Build/source/libs/zlib/zlib-1.2.8/inffast.c @@ -1,5 +1,5 @@ /* inffast.c -- fast decoding - * Copyright (C) 1995-2008, 2010 Mark Adler + * Copyright (C) 1995-2008, 2010, 2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -69,8 +69,8 @@ z_streamp strm; unsigned start; /* inflate()'s starting value for strm->avail_out */ { struct inflate_state FAR *state; - unsigned char FAR *in; /* local strm->next_in */ - unsigned char FAR *last; /* while in < last, enough input available */ + z_const unsigned char FAR *in; /* local strm->next_in */ + z_const unsigned char FAR *last; /* have enough input while in < last */ unsigned char FAR *out; /* local strm->next_out */ unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ unsigned char FAR *end; /* while out < end, enough space available */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/inffast.h b/Build/source/libs/zlib/zlib-1.2.8/inffast.h index e5c1aa4ca8c..e5c1aa4ca8c 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/inffast.h +++ b/Build/source/libs/zlib/zlib-1.2.8/inffast.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/inffixed.h b/Build/source/libs/zlib/zlib-1.2.8/inffixed.h index d6283277694..d6283277694 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/inffixed.h +++ b/Build/source/libs/zlib/zlib-1.2.8/inffixed.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/inflate.c b/Build/source/libs/zlib/zlib-1.2.8/inflate.c index 47418a1e1e1..870f89bb4d3 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/inflate.c +++ b/Build/source/libs/zlib/zlib-1.2.8/inflate.c @@ -93,11 +93,12 @@ /* function prototypes */ local void fixedtables OF((struct inflate_state FAR *state)); -local int updatewindow OF((z_streamp strm, unsigned out)); +local int updatewindow OF((z_streamp strm, const unsigned char FAR *end, + unsigned copy)); #ifdef BUILDFIXED void makefixed OF((void)); #endif -local unsigned syncsearch OF((unsigned FAR *have, unsigned char FAR *buf, +local unsigned syncsearch OF((unsigned FAR *have, const unsigned char FAR *buf, unsigned len)); int ZEXPORT inflateResetKeep(strm) @@ -375,12 +376,13 @@ void makefixed() output will fall in the output data, making match copies simpler and faster. The advantage may be dependent on the size of the processor's data caches. */ -local int updatewindow(strm, out) +local int updatewindow(strm, end, copy) z_streamp strm; -unsigned out; +const Bytef *end; +unsigned copy; { struct inflate_state FAR *state; - unsigned copy, dist; + unsigned dist; state = (struct inflate_state FAR *)strm->state; @@ -400,19 +402,18 @@ unsigned out; } /* copy state->wsize or less output bytes into the circular window */ - copy = out - strm->avail_out; if (copy >= state->wsize) { - zmemcpy(state->window, strm->next_out - state->wsize, state->wsize); + zmemcpy(state->window, end - state->wsize, state->wsize); state->wnext = 0; state->whave = state->wsize; } else { dist = state->wsize - state->wnext; if (dist > copy) dist = copy; - zmemcpy(state->window + state->wnext, strm->next_out - copy, dist); + zmemcpy(state->window + state->wnext, end - copy, dist); copy -= dist; if (copy) { - zmemcpy(state->window, strm->next_out - copy, copy); + zmemcpy(state->window, end - copy, copy); state->wnext = copy; state->whave = state->wsize; } @@ -606,7 +607,7 @@ z_streamp strm; int flush; { struct inflate_state FAR *state; - unsigned char FAR *next; /* next input */ + z_const unsigned char FAR *next; /* next input */ unsigned char FAR *put; /* next output */ unsigned have, left; /* available input and output */ unsigned long hold; /* bit buffer */ @@ -920,7 +921,7 @@ int flush; while (state->have < 19) state->lens[order[state->have++]] = 0; state->next = state->codes; - state->lencode = (code const FAR *)(state->next); + state->lencode = (const code FAR *)(state->next); state->lenbits = 7; ret = inflate_table(CODES, state->lens, 19, &(state->next), &(state->lenbits), state->work); @@ -994,7 +995,7 @@ int flush; values here (9 and 6) without reading the comments in inftrees.h concerning the ENOUGH constants, which depend on those values */ state->next = state->codes; - state->lencode = (code const FAR *)(state->next); + state->lencode = (const code FAR *)(state->next); state->lenbits = 9; ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), &(state->lenbits), state->work); @@ -1003,7 +1004,7 @@ int flush; state->mode = BAD; break; } - state->distcode = (code const FAR *)(state->next); + state->distcode = (const code FAR *)(state->next); state->distbits = 6; ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, &(state->next), &(state->distbits), state->work); @@ -1230,7 +1231,7 @@ int flush; RESTORE(); if (state->wsize || (out != strm->avail_out && state->mode < BAD && (state->mode < CHECK || flush != Z_FINISH))) - if (updatewindow(strm, out)) { + if (updatewindow(strm, strm->next_out, out - strm->avail_out)) { state->mode = MEM; return Z_MEM_ERROR; } @@ -1264,6 +1265,29 @@ z_streamp strm; return Z_OK; } +int ZEXPORT inflateGetDictionary(strm, dictionary, dictLength) +z_streamp strm; +Bytef *dictionary; +uInt *dictLength; +{ + struct inflate_state FAR *state; + + /* check state */ + if (strm == Z_NULL || strm->state == Z_NULL) return Z_STREAM_ERROR; + state = (struct inflate_state FAR *)strm->state; + + /* copy dictionary */ + if (state->whave && dictionary != Z_NULL) { + zmemcpy(dictionary, state->window + state->wnext, + state->whave - state->wnext); + zmemcpy(dictionary + state->whave - state->wnext, + state->window, state->wnext); + } + if (dictLength != Z_NULL) + *dictLength = state->whave; + return Z_OK; +} + int ZEXPORT inflateSetDictionary(strm, dictionary, dictLength) z_streamp strm; const Bytef *dictionary; @@ -1271,8 +1295,6 @@ uInt dictLength; { struct inflate_state FAR *state; unsigned long dictid; - unsigned char *next; - unsigned avail; int ret; /* check state */ @@ -1291,13 +1313,7 @@ uInt dictLength; /* copy dictionary to window using updatewindow(), which will amend the existing dictionary if appropriate */ - next = strm->next_out; - avail = strm->avail_out; - strm->next_out = (Bytef *)dictionary + dictLength; - strm->avail_out = 0; - ret = updatewindow(strm, dictLength); - strm->avail_out = avail; - strm->next_out = next; + ret = updatewindow(strm, dictionary + dictLength, dictLength); if (ret) { state->mode = MEM; return Z_MEM_ERROR; @@ -1337,7 +1353,7 @@ gz_headerp head; */ local unsigned syncsearch(have, buf, len) unsigned FAR *have; -unsigned char FAR *buf; +const unsigned char FAR *buf; unsigned len; { unsigned got; diff --git a/Build/source/libs/zlib/zlib-1.2.7/inflate.h b/Build/source/libs/zlib/zlib-1.2.8/inflate.h index 95f4986d400..95f4986d400 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/inflate.h +++ b/Build/source/libs/zlib/zlib-1.2.8/inflate.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/inftrees.c b/Build/source/libs/zlib/zlib-1.2.8/inftrees.c index abcd7c45ed3..44d89cf24e1 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/inftrees.c +++ b/Build/source/libs/zlib/zlib-1.2.8/inftrees.c @@ -1,5 +1,5 @@ /* inftrees.c -- generate Huffman trees for efficient decoding - * Copyright (C) 1995-2012 Mark Adler + * Copyright (C) 1995-2013 Mark Adler * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate_copyright[] = - " inflate 1.2.7 Copyright 1995-2012 Mark Adler "; + " inflate 1.2.8 Copyright 1995-2013 Mark Adler "; /* If you use the zlib library in a product, an acknowledgment is welcome in the documentation of your product. If for some reason you cannot @@ -62,7 +62,7 @@ unsigned short FAR *work; 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; static const unsigned short lext[31] = { /* Length codes 257..285 extra */ 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, - 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 68}; + 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 72, 78}; static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, @@ -208,8 +208,8 @@ unsigned short FAR *work; mask = used - 1; /* mask for comparing low */ /* check available table space */ - if ((type == LENS && used >= ENOUGH_LENS) || - (type == DISTS && used >= ENOUGH_DISTS)) + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) return 1; /* process all codes and make table entries */ @@ -277,8 +277,8 @@ unsigned short FAR *work; /* check for enough space */ used += 1U << curr; - if ((type == LENS && used >= ENOUGH_LENS) || - (type == DISTS && used >= ENOUGH_DISTS)) + if ((type == LENS && used > ENOUGH_LENS) || + (type == DISTS && used > ENOUGH_DISTS)) return 1; /* point entry in root table to sub-table */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/inftrees.h b/Build/source/libs/zlib/zlib-1.2.8/inftrees.h index baa53a0b1a1..baa53a0b1a1 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/inftrees.h +++ b/Build/source/libs/zlib/zlib-1.2.8/inftrees.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/make_vms.com b/Build/source/libs/zlib/zlib-1.2.8/make_vms.com index 65e9d0cbc8e..65e9d0cbc8e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/make_vms.com +++ b/Build/source/libs/zlib/zlib-1.2.8/make_vms.com diff --git a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.bor b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.bor index 3d12a2c2527..3d12a2c2527 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.bor +++ b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.bor diff --git a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.dj2 b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.dj2 index 29b03954d7b..29b03954d7b 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.dj2 +++ b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.dj2 diff --git a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.emx b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.emx index 9c1b57a5857..9c1b57a5857 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.emx +++ b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.emx diff --git a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.msc b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.msc index ae8378615ec..ae8378615ec 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.msc +++ b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.msc diff --git a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.tc b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.tc index 5aec82a9d58..5aec82a9d58 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/msdos/Makefile.tc +++ b/Build/source/libs/zlib/zlib-1.2.8/msdos/Makefile.tc diff --git a/Build/source/libs/zlib/zlib-1.2.7/nintendods/Makefile b/Build/source/libs/zlib/zlib-1.2.8/nintendods/Makefile index 21337d01ab2..21337d01ab2 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/nintendods/Makefile +++ b/Build/source/libs/zlib/zlib-1.2.8/nintendods/Makefile diff --git a/Build/source/libs/zlib/zlib-1.2.7/nintendods/README b/Build/source/libs/zlib/zlib-1.2.8/nintendods/README index ba7a37dbe8e..ba7a37dbe8e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/nintendods/README +++ b/Build/source/libs/zlib/zlib-1.2.8/nintendods/README diff --git a/Build/source/libs/zlib/zlib-1.2.7/old/Makefile.emx b/Build/source/libs/zlib/zlib-1.2.8/old/Makefile.emx index 4d6ab0efa66..4d6ab0efa66 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/old/Makefile.emx +++ b/Build/source/libs/zlib/zlib-1.2.8/old/Makefile.emx diff --git a/Build/source/libs/zlib/zlib-1.2.7/old/Makefile.riscos b/Build/source/libs/zlib/zlib-1.2.8/old/Makefile.riscos index 57e29d3fba9..57e29d3fba9 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/old/Makefile.riscos +++ b/Build/source/libs/zlib/zlib-1.2.8/old/Makefile.riscos diff --git a/Build/source/libs/zlib/zlib-1.2.7/old/README b/Build/source/libs/zlib/zlib-1.2.8/old/README index 800bf079827..800bf079827 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/old/README +++ b/Build/source/libs/zlib/zlib-1.2.8/old/README diff --git a/Build/source/libs/zlib/zlib-1.2.7/old/descrip.mms b/Build/source/libs/zlib/zlib-1.2.8/old/descrip.mms index 7066da5b557..7066da5b557 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/old/descrip.mms +++ b/Build/source/libs/zlib/zlib-1.2.8/old/descrip.mms diff --git a/Build/source/libs/zlib/zlib-1.2.7/old/os2/Makefile.os2 b/Build/source/libs/zlib/zlib-1.2.8/old/os2/Makefile.os2 index a105aaa5bbd..a105aaa5bbd 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/old/os2/Makefile.os2 +++ b/Build/source/libs/zlib/zlib-1.2.8/old/os2/Makefile.os2 diff --git a/Build/source/libs/zlib/zlib-1.2.7/old/os2/zlib.def b/Build/source/libs/zlib/zlib-1.2.8/old/os2/zlib.def index 4c753f1a3b9..4c753f1a3b9 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/old/os2/zlib.def +++ b/Build/source/libs/zlib/zlib-1.2.8/old/os2/zlib.def diff --git a/Build/source/libs/zlib/zlib-1.2.7/old/visual-basic.txt b/Build/source/libs/zlib/zlib-1.2.8/old/visual-basic.txt index 57efe58124e..57efe58124e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/old/visual-basic.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/old/visual-basic.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/qnx/package.qpg b/Build/source/libs/zlib/zlib-1.2.8/qnx/package.qpg index 26eed9b34fe..aebf6e3ac12 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/qnx/package.qpg +++ b/Build/source/libs/zlib/zlib-1.2.8/qnx/package.qpg @@ -25,10 +25,10 @@ <QPG:Files> <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> - <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" user="root:bin" permission="644"/> - <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.7"/> - <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.7"/> - <QPG:Add file="../libz.so.1.2.7" install="/opt/lib/" component="slib"/> + <QPG:Add file="../libz.so.1.2.8" install="/opt/lib/" user="root:bin" permission="644"/> + <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.8"/> + <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.8"/> + <QPG:Add file="../libz.so.1.2.8" install="/opt/lib/" component="slib"/> </QPG:Files> <QPG:PackageFilter> @@ -63,7 +63,7 @@ </QPM:ProductDescription> <QPM:ReleaseDescription> - <QPM:ReleaseVersion>1.2.7</QPM:ReleaseVersion> + <QPM:ReleaseVersion>1.2.8</QPM:ReleaseVersion> <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> <QPM:ReleaseStability>Stable</QPM:ReleaseStability> <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> diff --git a/Build/source/libs/zlib/zlib-1.2.7/test/example.c b/Build/source/libs/zlib/zlib-1.2.8/test/example.c index f515a4853d6..138a699bd53 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/test/example.c +++ b/Build/source/libs/zlib/zlib-1.2.8/test/example.c @@ -26,7 +26,7 @@ } \ } -const char hello[] = "hello, hello!"; +z_const char hello[] = "hello, hello!"; /* "hello world" would be more standard, but the repeated "hello" * stresses the compression code better, sorry... */ @@ -212,7 +212,7 @@ void test_deflate(compr, comprLen) err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); CHECK_ERR(err, "deflateInit"); - c_stream.next_in = (Bytef*)hello; + c_stream.next_in = (z_const unsigned char *)hello; c_stream.next_out = compr; while (c_stream.total_in != len && c_stream.total_out < comprLen) { @@ -387,7 +387,7 @@ void test_flush(compr, comprLen) err = deflateInit(&c_stream, Z_DEFAULT_COMPRESSION); CHECK_ERR(err, "deflateInit"); - c_stream.next_in = (Bytef*)hello; + c_stream.next_in = (z_const unsigned char *)hello; c_stream.next_out = compr; c_stream.avail_in = 3; c_stream.avail_out = (uInt)*comprLen; @@ -476,7 +476,7 @@ void test_dict_deflate(compr, comprLen) c_stream.next_out = compr; c_stream.avail_out = (uInt)comprLen; - c_stream.next_in = (Bytef*)hello; + c_stream.next_in = (z_const unsigned char *)hello; c_stream.avail_in = (uInt)strlen(hello)+1; err = deflate(&c_stream, Z_FINISH); diff --git a/Build/source/libs/zlib/zlib-1.2.7/test/infcover.c b/Build/source/libs/zlib/zlib-1.2.8/test/infcover.c index fe3d9203a02..fe3d9203a02 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/test/infcover.c +++ b/Build/source/libs/zlib/zlib-1.2.8/test/infcover.c diff --git a/Build/source/libs/zlib/zlib-1.2.7/test/minigzip.c b/Build/source/libs/zlib/zlib-1.2.8/test/minigzip.c index aa7ac7a0494..b3025a489a9 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/test/minigzip.c +++ b/Build/source/libs/zlib/zlib-1.2.8/test/minigzip.c @@ -40,6 +40,10 @@ # define SET_BINARY_MODE(file) #endif +#ifdef _MSC_VER +# define snprintf _snprintf +#endif + #ifdef VMS # define unlink delete # define GZ_SUFFIX "-gz" @@ -463,8 +467,12 @@ void file_compress(file, mode) exit(1); } +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(outfile, sizeof(outfile), "%s%s", file, GZ_SUFFIX); +#else strcpy(outfile, file); strcat(outfile, GZ_SUFFIX); +#endif in = fopen(file, "rb"); if (in == NULL) { @@ -499,7 +507,11 @@ void file_uncompress(file) exit(1); } +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(buf, sizeof(buf), "%s", file); +#else strcpy(buf, file); +#endif if (len > SUFFIX_LEN && strcmp(file+len-SUFFIX_LEN, GZ_SUFFIX) == 0) { infile = file; @@ -508,7 +520,11 @@ void file_uncompress(file) } else { outfile = file; infile = buf; +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(buf + len, sizeof(buf) - len, "%s", GZ_SUFFIX); +#else strcat(infile, GZ_SUFFIX); +#endif } in = gzopen(infile, "rb"); if (in == NULL) { @@ -546,7 +562,11 @@ int main(argc, argv) gzFile file; char *bname, outmode[20]; +#if !defined(NO_snprintf) && !defined(NO_vsnprintf) + snprintf(outmode, sizeof(outmode), "%s", "wb6 "); +#else strcpy(outmode, "wb6 "); +#endif prog = argv[0]; bname = strrchr(argv[0], '/'); diff --git a/Build/source/libs/zlib/zlib-1.2.7/treebuild.xml b/Build/source/libs/zlib/zlib-1.2.8/treebuild.xml index 1f4d15f4e38..38d29d75efc 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/treebuild.xml +++ b/Build/source/libs/zlib/zlib-1.2.8/treebuild.xml @@ -1,6 +1,6 @@ <?xml version="1.0" ?> -<package name="zlib" version="1.2.7"> - <library name="zlib" dlversion="1.2.7" dlname="z"> +<package name="zlib" version="1.2.8"> + <library name="zlib" dlversion="1.2.8" dlname="z"> <property name="description"> zip compression library </property> <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> diff --git a/Build/source/libs/zlib/zlib-1.2.7/trees.c b/Build/source/libs/zlib/zlib-1.2.8/trees.c index 8c32b214b1d..1fd7759ef00 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/trees.c +++ b/Build/source/libs/zlib/zlib-1.2.8/trees.c @@ -146,8 +146,8 @@ local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); local int build_bl_tree OF((deflate_state *s)); local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, int blcodes)); -local void compress_block OF((deflate_state *s, ct_data *ltree, - ct_data *dtree)); +local void compress_block OF((deflate_state *s, const ct_data *ltree, + const ct_data *dtree)); local int detect_data_type OF((deflate_state *s)); local unsigned bi_reverse OF((unsigned value, int length)); local void bi_windup OF((deflate_state *s)); @@ -972,7 +972,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { #endif send_bits(s, (STATIC_TREES<<1)+last, 3); - compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); + compress_block(s, (const ct_data *)static_ltree, + (const ct_data *)static_dtree); #ifdef DEBUG s->compressed_len += 3 + s->static_len; #endif @@ -980,7 +981,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) send_bits(s, (DYN_TREES<<1)+last, 3); send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, max_blindex+1); - compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); + compress_block(s, (const ct_data *)s->dyn_ltree, + (const ct_data *)s->dyn_dtree); #ifdef DEBUG s->compressed_len += 3 + s->opt_len; #endif @@ -1057,8 +1059,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) */ local void compress_block(s, ltree, dtree) deflate_state *s; - ct_data *ltree; /* literal tree */ - ct_data *dtree; /* distance tree */ + const ct_data *ltree; /* literal tree */ + const ct_data *dtree; /* distance tree */ { unsigned dist; /* distance of matched string */ int lc; /* match length or unmatched char (if dist == 0) */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/trees.h b/Build/source/libs/zlib/zlib-1.2.8/trees.h index d35639d82a2..d35639d82a2 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/trees.h +++ b/Build/source/libs/zlib/zlib-1.2.8/trees.h diff --git a/Build/source/libs/zlib/zlib-1.2.7/uncompr.c b/Build/source/libs/zlib/zlib-1.2.8/uncompr.c index ad98be3a5d8..242e9493dff 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/uncompr.c +++ b/Build/source/libs/zlib/zlib-1.2.8/uncompr.c @@ -30,7 +30,7 @@ int ZEXPORT uncompress (dest, destLen, source, sourceLen) z_stream stream; int err; - stream.next_in = (Bytef*)source; + stream.next_in = (z_const Bytef *)source; stream.avail_in = (uInt)sourceLen; /* Check for source > 64K on 16-bit machine: */ if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; diff --git a/Build/source/libs/zlib/zlib-1.2.7/watcom/watcom_f.mak b/Build/source/libs/zlib/zlib-1.2.8/watcom/watcom_f.mak index 37f4d74c19c..37f4d74c19c 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/watcom/watcom_f.mak +++ b/Build/source/libs/zlib/zlib-1.2.8/watcom/watcom_f.mak diff --git a/Build/source/libs/zlib/zlib-1.2.7/watcom/watcom_l.mak b/Build/source/libs/zlib/zlib-1.2.8/watcom/watcom_l.mak index 193eed7b318..193eed7b318 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/watcom/watcom_l.mak +++ b/Build/source/libs/zlib/zlib-1.2.8/watcom/watcom_l.mak diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/DLL_FAQ.txt b/Build/source/libs/zlib/zlib-1.2.8/win32/DLL_FAQ.txt index 12c009018c3..12c009018c3 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/DLL_FAQ.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/DLL_FAQ.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.bor b/Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.bor index d152bbb7ffd..d152bbb7ffd 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.bor +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.bor diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.gcc b/Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.gcc index 6d1ded622bf..6d1ded622bf 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.gcc +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.gcc diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.msc b/Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.msc index 59bb0dae5d2..67b773171da 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/Makefile.msc +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/Makefile.msc @@ -9,6 +9,10 @@ # nmake -f win32/Makefile.msc AS=ml64 LOC="-DASMV -DASMINF -I." \ # OBJA="inffasx64.obj gvmat64.obj inffas8664.obj" (use ASM code, x64) +# The toplevel directory of the source tree. +# +TOP = . + # optional build flags LOC = @@ -43,8 +47,8 @@ $(STATICLIB): $(OBJS) $(OBJA) $(IMPLIB): $(SHAREDLIB) -$(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlib1.res - $(LD) $(LDFLAGS) -def:win32/zlib.def -dll -implib:$(IMPLIB) \ +$(SHAREDLIB): $(TOP)/win32/zlib.def $(OBJS) $(OBJA) zlib1.res + $(LD) $(LDFLAGS) -def:$(TOP)/win32/zlib.def -dll -implib:$(IMPLIB) \ -out:$@ -base:0x5A4C0000 $(OBJS) $(OBJA) zlib1.res if exist $@.manifest \ mt -nologo -manifest $@.manifest -outputresource:$@;2 @@ -69,72 +73,71 @@ minigzip_d.exe: minigzip.obj $(IMPLIB) if exist $@.manifest \ mt -nologo -manifest $@.manifest -outputresource:$@;1 -.c.obj: +{$(TOP)}.c.obj: $(CC) -c $(WFLAGS) $(CFLAGS) $< -{test}.c.obj: - $(CC) -c -I. $(WFLAGS) $(CFLAGS) $< +{$(TOP)/test}.c.obj: + $(CC) -c -I$(TOP) $(WFLAGS) $(CFLAGS) $< -{contrib/masmx64}.c.obj: +{$(TOP)/contrib/masmx64}.c.obj: $(CC) -c $(WFLAGS) $(CFLAGS) $< -{contrib/masmx64}.asm.obj: +{$(TOP)/contrib/masmx64}.asm.obj: $(AS) -c $(ASFLAGS) $< -{contrib/masmx86}.asm.obj: +{$(TOP)/contrib/masmx86}.asm.obj: $(AS) -c $(ASFLAGS) $< -adler32.obj: adler32.c zlib.h zconf.h - -compress.obj: compress.c zlib.h zconf.h +adler32.obj: $(TOP)/adler32.c $(TOP)/zlib.h $(TOP)/zconf.h -crc32.obj: crc32.c zlib.h zconf.h crc32.h +compress.obj: $(TOP)/compress.c $(TOP)/zlib.h $(TOP)/zconf.h -deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h +crc32.obj: $(TOP)/crc32.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/crc32.h -gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h +deflate.obj: $(TOP)/deflate.c $(TOP)/deflate.h $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h -gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h +gzclose.obj: $(TOP)/gzclose.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h -gzread.obj: gzread.c zlib.h zconf.h gzguts.h +gzlib.obj: $(TOP)/gzlib.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h -gzwrite.obj: gzwrite.c zlib.h zconf.h gzguts.h +gzread.obj: $(TOP)/gzread.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h -infback.obj: infback.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ - inffast.h inffixed.h +gzwrite.obj: $(TOP)/gzwrite.c $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/gzguts.h -inffast.obj: inffast.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ - inffast.h +infback.obj: $(TOP)/infback.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \ + $(TOP)/inffast.h $(TOP)/inffixed.h -inflate.obj: inflate.c zutil.h zlib.h zconf.h inftrees.h inflate.h \ - inffast.h inffixed.h +inffast.obj: $(TOP)/inffast.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \ + $(TOP)/inffast.h -inftrees.obj: inftrees.c zutil.h zlib.h zconf.h inftrees.h +inflate.obj: $(TOP)/inflate.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h $(TOP)/inflate.h \ + $(TOP)/inffast.h $(TOP)/inffixed.h -trees.obj: trees.c zutil.h zlib.h zconf.h deflate.h trees.h +inftrees.obj: $(TOP)/inftrees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/inftrees.h -uncompr.obj: uncompr.c zlib.h zconf.h +trees.obj: $(TOP)/trees.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h $(TOP)/deflate.h $(TOP)/trees.h -zutil.obj: zutil.c zutil.h zlib.h zconf.h +uncompr.obj: $(TOP)/uncompr.c $(TOP)/zlib.h $(TOP)/zconf.h -gvmat64.obj: contrib\masmx64\gvmat64.asm +zutil.obj: $(TOP)/zutil.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h -inffasx64.obj: contrib\masmx64\inffasx64.asm +gvmat64.obj: $(TOP)/contrib\masmx64\gvmat64.asm -inffas8664.obj: contrib\masmx64\inffas8664.c zutil.h zlib.h zconf.h \ - inftrees.h inflate.h inffast.h +inffasx64.obj: $(TOP)/contrib\masmx64\inffasx64.asm -inffas32.obj: contrib\masmx86\inffas32.asm +inffas8664.obj: $(TOP)/contrib\masmx64\inffas8664.c $(TOP)/zutil.h $(TOP)/zlib.h $(TOP)/zconf.h \ + $(TOP)/inftrees.h $(TOP)/inflate.h $(TOP)/inffast.h -match686.obj: contrib\masmx86\match686.asm +inffas32.obj: $(TOP)/contrib\masmx86\inffas32.asm -example.obj: test/example.c zlib.h zconf.h +match686.obj: $(TOP)/contrib\masmx86\match686.asm -minigzip.obj: test/minigzip.c zlib.h zconf.h +example.obj: $(TOP)/test/example.c $(TOP)/zlib.h $(TOP)/zconf.h -zlib1.res: win32/zlib1.rc - $(RC) $(RCFLAGS) /fo$@ win32/zlib1.rc +minigzip.obj: $(TOP)/test/minigzip.c $(TOP)/zlib.h $(TOP)/zconf.h +zlib1.res: $(TOP)/win32/zlib1.rc + $(RC) $(RCFLAGS) /fo$@ $(TOP)/win32/zlib1.rc # testing test: example.exe minigzip.exe diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/README-WIN32.txt b/Build/source/libs/zlib/zlib-1.2.8/win32/README-WIN32.txt index 46c5923c4c6..3d77d521e83 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/README-WIN32.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/README-WIN32.txt @@ -1,6 +1,6 @@ ZLIB DATA COMPRESSION LIBRARY -zlib 1.2.7 is a general purpose data compression library. All the code is +zlib 1.2.8 is a general purpose data compression library. All the code is thread safe. The data format used by the zlib library is described by RFCs (Request for Comments) 1950 to 1952 in the files http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) @@ -22,7 +22,7 @@ before asking for help. Manifest: -The package zlib-1.2.7-win32-x86.zip will contain the following files: +The package zlib-1.2.8-win32-x86.zip will contain the following files: README-WIN32.txt This document ChangeLog Changes since previous zlib packages diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/VisualC.txt b/Build/source/libs/zlib/zlib-1.2.8/win32/VisualC.txt index 579a5fc9e0f..579a5fc9e0f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/VisualC.txt +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/VisualC.txt diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/zlib.def b/Build/source/libs/zlib/zlib-1.2.8/win32/zlib.def index 04896150e4b..face655183a 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/zlib.def +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/zlib.def @@ -17,6 +17,7 @@ EXPORTS deflatePrime deflateSetHeader inflateSetDictionary + inflateGetDictionary inflateSync inflateCopy inflateReset @@ -39,6 +40,7 @@ EXPORTS gzread gzwrite gzprintf + gzvprintf gzputs gzgets gzputc diff --git a/Build/source/libs/zlib/zlib-1.2.7/win32/zlib1.rc b/Build/source/libs/zlib/zlib-1.2.8/win32/zlib1.rc index 0d1d7ffcf70..5c0feed1b44 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/win32/zlib1.rc +++ b/Build/source/libs/zlib/zlib-1.2.8/win32/zlib1.rc @@ -26,7 +26,7 @@ BEGIN VALUE "FileDescription", "zlib data compression library\0" VALUE "FileVersion", ZLIB_VERSION "\0" VALUE "InternalName", "zlib1.dll\0" - VALUE "LegalCopyright", "(C) 1995-2006 Jean-loup Gailly & Mark Adler\0" + VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0" VALUE "OriginalFilename", "zlib1.dll\0" VALUE "ProductName", "zlib\0" VALUE "ProductVersion", ZLIB_VERSION "\0" diff --git a/Build/source/libs/zlib/zlib-1.2.7/zconf.h.cmakein b/Build/source/libs/zlib/zlib-1.2.8/zconf.h.cmakein index b6ca59ab427..043019cda1d 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zconf.h.cmakein +++ b/Build/source/libs/zlib/zlib-1.2.8/zconf.h.cmakein @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2012 Jean-loup Gailly. + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -23,6 +23,7 @@ # define _dist_code z__dist_code # define _length_code z__length_code # define _tr_align z__tr_align +# define _tr_flush_bits z__tr_flush_bits # define _tr_flush_block z__tr_flush_block # define _tr_init z__tr_init # define _tr_stored_block z__tr_stored_block @@ -79,6 +80,7 @@ # define gzopen_w z_gzopen_w # endif # define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf # define gzputc z_gzputc # define gzputs z_gzputs # define gzread z_gzread @@ -105,6 +107,7 @@ # define inflateReset z_inflateReset # define inflateReset2 z_inflateReset2 # define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary # define inflateSync z_inflateSync # define inflateSyncPoint z_inflateSyncPoint # define inflateUndermine z_inflateUndermine @@ -390,20 +393,14 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -/* ./configure may #define Z_U4 here */ - #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) # include <limits.h> # if (UINT_MAX == 0xffffffffUL) # define Z_U4 unsigned -# else -# if (ULONG_MAX == 0xffffffffUL) -# define Z_U4 unsigned long -# else -# if (USHRT_MAX == 0xffffffffUL) -# define Z_U4 unsigned short -# endif -# endif +# elif (ULONG_MAX == 0xffffffffUL) +# define Z_U4 unsigned long +# elif (USHRT_MAX == 0xffffffffUL) +# define Z_U4 unsigned short # endif #endif @@ -427,8 +424,16 @@ typedef uLong FAR uLongf; # endif #endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +# include <stdarg.h> /* for va_list */ +# endif +#endif + #ifdef _WIN32 -# include <stddef.h> /* for wchar_t */ +# ifndef Z_SOLO +# include <stddef.h> /* for wchar_t */ +# endif #endif /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and @@ -437,7 +442,7 @@ typedef uLong FAR uLongf; * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as * equivalently requesting no 64-bit operations */ -#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 +#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 # undef _LARGEFILE64_SOURCE #endif @@ -445,7 +450,7 @@ typedef uLong FAR uLongf; # define Z_HAVE_UNISTD_H #endif #ifndef Z_SOLO -# if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE) +# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) # include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ # ifdef VMS # include <unixio.h> /* for off_t */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/zconf.h.in b/Build/source/libs/zlib/zlib-1.2.8/zconf.h.in index 8a46a58b30c..9987a775530 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zconf.h.in +++ b/Build/source/libs/zlib/zlib-1.2.8/zconf.h.in @@ -1,5 +1,5 @@ /* zconf.h -- configuration of the zlib compression library - * Copyright (C) 1995-2012 Jean-loup Gailly. + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -21,6 +21,7 @@ # define _dist_code z__dist_code # define _length_code z__length_code # define _tr_align z__tr_align +# define _tr_flush_bits z__tr_flush_bits # define _tr_flush_block z__tr_flush_block # define _tr_init z__tr_init # define _tr_stored_block z__tr_stored_block @@ -77,6 +78,7 @@ # define gzopen_w z_gzopen_w # endif # define gzprintf z_gzprintf +# define gzvprintf z_gzvprintf # define gzputc z_gzputc # define gzputs z_gzputs # define gzread z_gzread @@ -103,6 +105,7 @@ # define inflateReset z_inflateReset # define inflateReset2 z_inflateReset2 # define inflateSetDictionary z_inflateSetDictionary +# define inflateGetDictionary z_inflateGetDictionary # define inflateSync z_inflateSync # define inflateSyncPoint z_inflateSyncPoint # define inflateUndermine z_inflateUndermine @@ -388,20 +391,14 @@ typedef uLong FAR uLongf; typedef Byte *voidp; #endif -/* ./configure may #define Z_U4 here */ - #if !defined(Z_U4) && !defined(Z_SOLO) && defined(STDC) # include <limits.h> # if (UINT_MAX == 0xffffffffUL) # define Z_U4 unsigned -# else -# if (ULONG_MAX == 0xffffffffUL) -# define Z_U4 unsigned long -# else -# if (USHRT_MAX == 0xffffffffUL) -# define Z_U4 unsigned short -# endif -# endif +# elif (ULONG_MAX == 0xffffffffUL) +# define Z_U4 unsigned long +# elif (USHRT_MAX == 0xffffffffUL) +# define Z_U4 unsigned short # endif #endif @@ -425,8 +422,16 @@ typedef uLong FAR uLongf; # endif #endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +# include <stdarg.h> /* for va_list */ +# endif +#endif + #ifdef _WIN32 -# include <stddef.h> /* for wchar_t */ +# ifndef Z_SOLO +# include <stddef.h> /* for wchar_t */ +# endif #endif /* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and @@ -435,7 +440,7 @@ typedef uLong FAR uLongf; * both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as * equivalently requesting no 64-bit operations */ -#if defined(LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 +#if defined(_LARGEFILE64_SOURCE) && -_LARGEFILE64_SOURCE - -1 == 1 # undef _LARGEFILE64_SOURCE #endif @@ -443,7 +448,7 @@ typedef uLong FAR uLongf; # define Z_HAVE_UNISTD_H #endif #ifndef Z_SOLO -# if defined(Z_HAVE_UNISTD_H) || defined(LARGEFILE64_SOURCE) +# if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) # include <unistd.h> /* for SEEK_*, off_t, and _LFS64_LARGEFILE */ # ifdef VMS # include <unixio.h> /* for off_t */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/zlib.3 b/Build/source/libs/zlib/zlib-1.2.8/zlib.3 index 79d3402b39c..0160e62b69f 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zlib.3 +++ b/Build/source/libs/zlib/zlib-1.2.8/zlib.3 @@ -1,4 +1,4 @@ -.TH ZLIB 3 "2 May 2012" +.TH ZLIB 3 "28 Apr 2013" .SH NAME zlib \- compression/decompression library .SH SYNOPSIS @@ -125,8 +125,8 @@ before asking for help. Send questions and/or comments to zlib@gzip.org, or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). .SH AUTHORS -Version 1.2.7 -Copyright (C) 1995-2012 Jean-loup Gailly (jloup@gzip.org) +Version 1.2.8 +Copyright (C) 1995-2013 Jean-loup Gailly (jloup@gzip.org) and Mark Adler (madler@alumni.caltech.edu). .LP This software is provided "as-is," diff --git a/Build/source/libs/zlib/zlib-1.2.8/zlib.3.pdf b/Build/source/libs/zlib/zlib-1.2.8/zlib.3.pdf Binary files differnew file mode 100644 index 00000000000..a346b5d7e24 --- /dev/null +++ b/Build/source/libs/zlib/zlib-1.2.8/zlib.3.pdf diff --git a/Build/source/libs/zlib/zlib-1.2.7/zlib.h b/Build/source/libs/zlib/zlib-1.2.8/zlib.h index 3edf3acdb57..3e0c7672ac5 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zlib.h +++ b/Build/source/libs/zlib/zlib-1.2.8/zlib.h @@ -1,7 +1,7 @@ /* zlib.h -- interface of the 'zlib' general purpose compression library - version 1.2.7, May 2nd, 2012 + version 1.2.8, April 28th, 2013 - Copyright (C) 1995-2012 Jean-loup Gailly and Mark Adler + Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages @@ -37,11 +37,11 @@ extern "C" { #endif -#define ZLIB_VERSION "1.2.7" -#define ZLIB_VERNUM 0x1270 +#define ZLIB_VERSION "1.2.8" +#define ZLIB_VERNUM 0x1280 #define ZLIB_VER_MAJOR 1 #define ZLIB_VER_MINOR 2 -#define ZLIB_VER_REVISION 7 +#define ZLIB_VER_REVISION 8 #define ZLIB_VER_SUBREVISION 0 /* @@ -839,6 +839,21 @@ ZEXTERN int ZEXPORT inflateSetDictionary OF((z_streamp strm, inflate(). */ +ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm, + Bytef *dictionary, + uInt *dictLength)); +/* + Returns the sliding dictionary being maintained by inflate. dictLength is + set to the number of bytes in the dictionary, and that many bytes are copied + to dictionary. dictionary must have enough space, where 32768 bytes is + always enough. If inflateGetDictionary() is called with dictionary equal to + Z_NULL, then only the dictionary length is returned, and nothing is copied. + Similary, if dictLength is Z_NULL, then it is not set. + + inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the + stream state is inconsistent. +*/ + ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); /* Skips invalid compressed data until a possible full flush point (see above @@ -846,7 +861,7 @@ ZEXTERN int ZEXPORT inflateSync OF((z_streamp strm)); available input is skipped. No output is provided. inflateSync searches for a 00 00 FF FF pattern in the compressed data. - All full flush points have this pattern, but not all occurences of this + All full flush points have this pattern, but not all occurrences of this pattern are full flush points. inflateSync returns Z_OK if a possible full flush point has been found, @@ -1007,7 +1022,8 @@ ZEXTERN int ZEXPORT inflateBackInit OF((z_streamp strm, int windowBits, the version of the header file. */ -typedef unsigned (*in_func) OF((void FAR *, unsigned char FAR * FAR *)); +typedef unsigned (*in_func) OF((void FAR *, + z_const unsigned char FAR * FAR *)); typedef int (*out_func) OF((void FAR *, unsigned char FAR *, unsigned)); ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, @@ -1015,11 +1031,12 @@ ZEXTERN int ZEXPORT inflateBack OF((z_streamp strm, out_func out, void FAR *out_desc)); /* inflateBack() does a raw inflate with a single call using a call-back - interface for input and output. This is more efficient than inflate() for - file i/o applications in that it avoids copying between the output and the - sliding window by simply making the window itself the output buffer. This - function trusts the application to not change the output buffer passed by - the output function, at least until inflateBack() returns. + interface for input and output. This is potentially more efficient than + inflate() for file i/o applications, in that it avoids copying between the + output and the sliding window by simply making the window itself the output + buffer. inflate() can be faster on modern CPUs when used with large + buffers. inflateBack() trusts the application to not change the output + buffer passed by the output function, at least until inflateBack() returns. inflateBackInit() must be called first to allocate the internal state and to initialize the state with the user-provided window buffer. @@ -1736,6 +1753,13 @@ ZEXTERN int ZEXPORT deflateResetKeep OF((z_streamp)); ZEXTERN gzFile ZEXPORT gzopen_w OF((const wchar_t *path, const char *mode)); #endif +#if defined(STDC) || defined(Z_HAVE_STDARG_H) +# ifndef Z_SOLO +ZEXTERN int ZEXPORTVA gzvprintf Z_ARG((gzFile file, + const char *format, + va_list va)); +# endif +#endif #ifdef __cplusplus } diff --git a/Build/source/libs/zlib/zlib-1.2.7/zlib.map b/Build/source/libs/zlib/zlib-1.2.8/zlib.map index 771f420412e..55c6647eb46 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zlib.map +++ b/Build/source/libs/zlib/zlib-1.2.8/zlib.map @@ -76,3 +76,8 @@ ZLIB_1.2.5.2 { gzgetc_; inflateResetKeep; } ZLIB_1.2.5.1; + +ZLIB_1.2.7.1 { + inflateGetDictionary; + gzvprintf; +} ZLIB_1.2.5.2; diff --git a/Build/source/libs/zlib/zlib-1.2.7/zlib.pc.cmakein b/Build/source/libs/zlib/zlib-1.2.8/zlib.pc.cmakein index a5e642938c6..a5e642938c6 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zlib.pc.cmakein +++ b/Build/source/libs/zlib/zlib-1.2.8/zlib.pc.cmakein diff --git a/Build/source/libs/zlib/zlib-1.2.7/zlib.pc.in b/Build/source/libs/zlib/zlib-1.2.8/zlib.pc.in index 7e5acf9c77e..7e5acf9c77e 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zlib.pc.in +++ b/Build/source/libs/zlib/zlib-1.2.8/zlib.pc.in diff --git a/Build/source/libs/zlib/zlib-1.2.7/zlib2ansi b/Build/source/libs/zlib/zlib-1.2.8/zlib2ansi index 15e3e165f37..15e3e165f37 100755 --- a/Build/source/libs/zlib/zlib-1.2.7/zlib2ansi +++ b/Build/source/libs/zlib/zlib-1.2.8/zlib2ansi diff --git a/Build/source/libs/zlib/zlib-1.2.7/zutil.c b/Build/source/libs/zlib/zlib-1.2.8/zutil.c index 65e0d3b72b0..23d2ebef008 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zutil.c +++ b/Build/source/libs/zlib/zlib-1.2.8/zutil.c @@ -14,7 +14,7 @@ struct internal_state {int dummy;}; /* for buggy compilers */ #endif -const char * const z_errmsg[10] = { +z_const char * const z_errmsg[10] = { "need dictionary", /* Z_NEED_DICT 2 */ "stream end", /* Z_STREAM_END 1 */ "", /* Z_OK 0 */ diff --git a/Build/source/libs/zlib/zlib-1.2.7/zutil.h b/Build/source/libs/zlib/zlib-1.2.8/zutil.h index 4e3dcc6ae9f..24ab06b1cf6 100644 --- a/Build/source/libs/zlib/zlib-1.2.7/zutil.h +++ b/Build/source/libs/zlib/zlib-1.2.8/zutil.h @@ -1,5 +1,5 @@ /* zutil.h -- internal interface and configuration of the compression library - * Copyright (C) 1995-2012 Jean-loup Gailly. + * Copyright (C) 1995-2013 Jean-loup Gailly. * For conditions of distribution and use, see copyright notice in zlib.h */ @@ -44,13 +44,13 @@ typedef unsigned short ush; typedef ush FAR ushf; typedef unsigned long ulg; -extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ +extern z_const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ /* (size given to avoid silly warnings with Visual C++) */ #define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] #define ERR_RETURN(strm,err) \ - return (strm->msg = (char*)ERR_MSG(err), (err)) + return (strm->msg = ERR_MSG(err), (err)) /* To be used only when the state is known to be valid */ /* common constants */ @@ -168,7 +168,8 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ #endif /* provide prototypes for these when building zlib without LFS */ -#if !defined(_WIN32) && (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) +#if !defined(_WIN32) && \ + (!defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0) ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); #endif |