diff options
| author | Sam Roberts <vieuxtech@gmail.com> | 2017-01-20 11:01:40 -0800 |
|---|---|---|
| committer | Sam Roberts <vieuxtech@gmail.com> | 2017-02-20 08:45:48 -0800 |
| commit | dfa8abe1b500b86ffb3951736c209e57d83ed3ed (patch) | |
| tree | 462f78ca30dee5776c09642559dedc7ee5f1d3b2 /deps/zlib/examples | |
| parent | 4e6efc1dec0eb924b68d74648b661433119306fe (diff) | |
| download | android-node-v8-dfa8abe1b500b86ffb3951736c209e57d83ed3ed.tar.gz android-node-v8-dfa8abe1b500b86ffb3951736c209e57d83ed3ed.tar.bz2 android-node-v8-dfa8abe1b500b86ffb3951736c209e57d83ed3ed.zip | |
deps: upgrade zlib to 1.2.11
PR-URL: https://github.com/nodejs/node/pull/10980
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Shigeki Ohtsu <ohtsu@iij.ad.jp>
Diffstat (limited to 'deps/zlib/examples')
| -rw-r--r-- | deps/zlib/examples/gun.c | 2 | ||||
| -rw-r--r-- | deps/zlib/examples/gzlog.c | 4 | ||||
| -rw-r--r-- | deps/zlib/examples/zran.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/deps/zlib/examples/gun.c b/deps/zlib/examples/gun.c index 89e484fee6..be44fa51ff 100644 --- a/deps/zlib/examples/gun.c +++ b/deps/zlib/examples/gun.c @@ -46,7 +46,7 @@ end-of-file, they cannot be concantenated. If a Unix compress stream is encountered in an input file, it is the last stream in that file. - Like gunzip and uncompress, the file attributes of the orignal compressed + Like gunzip and uncompress, the file attributes of the original compressed file are maintained in the final uncompressed file, to the extent that the user permissions allow it. diff --git a/deps/zlib/examples/gzlog.c b/deps/zlib/examples/gzlog.c index 922f878dde..b8c29274e8 100644 --- a/deps/zlib/examples/gzlog.c +++ b/deps/zlib/examples/gzlog.c @@ -1,6 +1,6 @@ /* * gzlog.c - * Copyright (C) 2004, 2008, 2012 Mark Adler, all rights reserved + * Copyright (C) 2004, 2008, 2012, 2016 Mark Adler, all rights reserved * For conditions of distribution and use, see copyright notice in gzlog.h * version 2.2, 14 Aug 2012 */ @@ -243,7 +243,7 @@ typedef unsigned int uint; typedef unsigned long ulong; /* Macro for debugging to deterministically force recovery operations */ -#ifdef DEBUG +#ifdef GZLOG_DEBUG #include <setjmp.h> /* longjmp */ jmp_buf gzlog_jump; /* where to go back to */ int gzlog_bail = 0; /* which point to bail at (1..8) */ diff --git a/deps/zlib/examples/zran.c b/deps/zlib/examples/zran.c index 278f9ad07d..4fec6594a6 100644 --- a/deps/zlib/examples/zran.c +++ b/deps/zlib/examples/zran.c @@ -27,7 +27,7 @@ grows as needed to accommodate the points. To use the index, an offset in the uncompressed data is provided, for which - the latest accees point at or preceding that offset is located in the index. + the latest access point at or preceding that offset is located in the index. The input file is positioned to the specified location in the index, and if necessary the first few bits of the compressed data is read from the file. inflate is initialized with those bits and the 32K of uncompressed data, and |