diff options
Diffstat (limited to 'cpukit/zlib/contrib')
| -rw-r--r-- | cpukit/zlib/contrib/delphi/ZLib.pas | 2 | ||||
| -rw-r--r-- | cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs | 4 | ||||
| -rw-r--r-- | cpukit/zlib/contrib/infback9/inftree9.c | 4 | ||||
| -rw-r--r-- | cpukit/zlib/contrib/pascal/zlibpas.pas | 2 | ||||
| -rw-r--r-- | cpukit/zlib/contrib/vstudio/vc10/zlib.rc | 6 | ||||
| -rw-r--r-- | cpukit/zlib/contrib/vstudio/vc9/zlib.rc | 6 |
6 files changed, 12 insertions, 12 deletions
diff --git a/cpukit/zlib/contrib/delphi/ZLib.pas b/cpukit/zlib/contrib/delphi/ZLib.pas index 179f9a90cc..0d86fb52fc 100644 --- a/cpukit/zlib/contrib/delphi/ZLib.pas +++ b/cpukit/zlib/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.4'; + zlib_version = '1.2.5'; type EZlibError = class(Exception); diff --git a/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs index 42c45884bb..3bbcc8cee6 100644 --- a/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs @@ -156,7 +156,7 @@ namespace DotZLibTests public void Info_Version()
{
Info info = new Info();
- Assert.AreEqual("1.2.4", Info.Version);
+ Assert.AreEqual("1.2.5", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);
@@ -271,4 +271,4 @@ namespace DotZLibTests }
}
-#endif
\ No newline at end of file +#endif
diff --git a/cpukit/zlib/contrib/infback9/inftree9.c b/cpukit/zlib/contrib/infback9/inftree9.c index 510bba694e..306c5f1b19 100644 --- a/cpukit/zlib/contrib/infback9/inftree9.c +++ b/cpukit/zlib/contrib/infback9/inftree9.c @@ -9,7 +9,7 @@ #define MAXBITS 15 const char inflate9_copyright[] = - " inflate9 1.2.4 Copyright 1995-2010 Mark Adler "; + " inflate9 1.2.5 Copyright 1995-2010 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, 64, 195}; + 133, 133, 133, 133, 144, 73, 195}; 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/cpukit/zlib/contrib/pascal/zlibpas.pas b/cpukit/zlib/contrib/pascal/zlibpas.pas index dc7d37dae0..637ae3a3f8 100644 --- a/cpukit/zlib/contrib/pascal/zlibpas.pas +++ b/cpukit/zlib/contrib/pascal/zlibpas.pas @@ -10,7 +10,7 @@ unit zlibpas; interface const - ZLIB_VERSION = '1.2.4'; + ZLIB_VERSION = '1.2.5'; type alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; diff --git a/cpukit/zlib/contrib/vstudio/vc10/zlib.rc b/cpukit/zlib/contrib/vstudio/vc10/zlib.rc index 23802d86a2..f82245087d 100644 --- a/cpukit/zlib/contrib/vstudio/vc10/zlib.rc +++ b/cpukit/zlib/contrib/vstudio/vc10/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.4.0\0"
+ VALUE "FileVersion", "1.2.5\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
diff --git a/cpukit/zlib/contrib/vstudio/vc9/zlib.rc b/cpukit/zlib/contrib/vstudio/vc9/zlib.rc index 23802d86a2..f82245087d 100644 --- a/cpukit/zlib/contrib/vstudio/vc9/zlib.rc +++ b/cpukit/zlib/contrib/vstudio/vc9/zlib.rc @@ -2,8 +2,8 @@ #define IDR_VERSION1 1
IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE
- FILEVERSION 1,2,4,0
- PRODUCTVERSION 1,2,4,0
+ FILEVERSION 1,2,5,0
+ PRODUCTVERSION 1,2,5,0
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
FILEFLAGS 0
FILEOS VOS_DOS_WINDOWS32
@@ -17,7 +17,7 @@ BEGIN BEGIN
VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
- VALUE "FileVersion", "1.2.4.0\0"
+ VALUE "FileVersion", "1.2.5\0"
VALUE "InternalName", "zlib\0"
VALUE "OriginalFilename", "zlib.dll\0"
VALUE "ProductName", "ZLib.DLL\0"
|