diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:11:17 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2011-03-18 10:11:17 +0000 |
| commit | 28f0f60a6dfee43965e54f4c03d6c4440c5f729e (patch) | |
| tree | 6fabeb0ece20aa7b39bbbce01822fb39bad7466b /cpukit/zlib/contrib | |
| parent | Import from zlib-1.2.4 (diff) | |
| download | rtems-28f0f60a6dfee43965e54f4c03d6c4440c5f729e.tar.bz2 | |
Import from zlib-1.2.4
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 | 6 | ||||
| -rw-r--r-- | cpukit/zlib/contrib/pascal/zlibpas.pas | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cpukit/zlib/contrib/delphi/ZLib.pas b/cpukit/zlib/contrib/delphi/ZLib.pas index 3f2b8b4a5c..179f9a90cc 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.3'; + zlib_version = '1.2.4'; type EZlibError = class(Exception); diff --git a/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs b/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs index 8dc00db92d..42c45884bb 100644 --- a/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs +++ b/cpukit/zlib/contrib/dotzlib/DotZLib/UnitTests.cs @@ -1,7 +1,7 @@ //
// © Copyright Henrik Ravn 2004
//
-// Use, modification and distribution are subject to the Boost Software License, Version 1.0.
+// 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.3", Info.Version);
+ Assert.AreEqual("1.2.4", Info.Version);
Assert.AreEqual(32, info.SizeOfUInt);
Assert.AreEqual(32, info.SizeOfULong);
Assert.AreEqual(32, info.SizeOfPointer);
@@ -225,7 +225,7 @@ namespace DotZLibTests [Test]
public void Inflate_Expand()
- {
+ {
uncompressedData.Clear();
using (Inflater inf = new Inflater())
diff --git a/cpukit/zlib/contrib/pascal/zlibpas.pas b/cpukit/zlib/contrib/pascal/zlibpas.pas index 836848c2b7..dc7d37dae0 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.3'; + ZLIB_VERSION = '1.2.4'; type alloc_func = function(opaque: Pointer; items, size: Integer): Pointer; |