diff options
| author | Tobias Krause <tkr@openoffice.org> | 2009-11-25 11:31:54 +0100 |
|---|---|---|
| committer | Tobias Krause <tkr@openoffice.org> | 2009-11-25 11:31:54 +0100 |
| commit | baba8fcb69aa6fbef5f1ac3bb31694950bb38196 (patch) | |
| tree | 7c3992a0fae919d4a5ea4e8133e68ccc5a9e50be /zlib | |
| parent | 66966edad55609391e640ccb6b4b16d3fe53b394 (diff) | |
tkr32: #i105006# applied patch
Diffstat (limited to 'zlib')
| -rw-r--r-- | zlib/zlib-1.1.4.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/zlib/zlib-1.1.4.patch b/zlib/zlib-1.1.4.patch index 34f2fdde44ee..d17f31f5ccda 100644 --- a/zlib/zlib-1.1.4.patch +++ b/zlib/zlib-1.1.4.patch @@ -192,7 +192,7 @@ + also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html +*/ +/* -+ crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h] ++ crypt.c (full version) by Info-ZIP. Last revised: [see info_zip_crypt.h] + + The encryption/decryption parts of this source code (as opposed to the + non-echoing password parts) were originally written in Europe. The @@ -334,7 +334,7 @@ +#ifndef NOUNCRYPT -+#include "crypt.h" ++#include "info_zip_crypt.h" +#endif + /* =========================================================================== @@ -2855,10 +2855,10 @@ #ifdef __cplusplus } #endif - --- misc/zlib-1.1.4/contrib/minizip/crypt.h 2009-07-17 11:13:37.281250000 +0200 -+++ misc/build/zlib-1.1.4/contrib/minizip/crypt.h 2009-07-17 10:58:41.843750000 +0200 +--- misc/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 11:13:37.281250000 +0200 ++++ misc/build/zlib-1.1.4/contrib/minizip/info_zip_crypt.h 2009-07-17 10:58:41.843750000 +0200 @@ -0,0 +1,132 @@ -+/* crypt.h -- base code for crypt/uncrypt ZIPfile ++/* info_zip_crypt.h -- base code for crypt/uncrypt ZIPfile + + + Version 1.01e, February 12th, 2005 |