diff options
Diffstat (limited to 'contrib/infback9')
-rw-r--r-- | contrib/infback9/infback9.h | 8 | ||||
-rw-r--r-- | contrib/infback9/inftree9.c | 6 |
2 files changed, 11 insertions, 3 deletions
diff --git a/contrib/infback9/infback9.h b/contrib/infback9/infback9.h index 10bf58c..1073c0a 100644 --- a/contrib/infback9/infback9.h +++ b/contrib/infback9/infback9.h | |||
@@ -16,6 +16,10 @@ | |||
16 | * zlib.h must be included before this header file. | 16 | * zlib.h must be included before this header file. |
17 | */ | 17 | */ |
18 | 18 | ||
19 | #ifdef __cplusplus | ||
20 | extern "C" { | ||
21 | #endif | ||
22 | |||
19 | ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm, | 23 | ZEXTERN int ZEXPORT inflateBack9 OF((z_stream FAR *strm, |
20 | in_func in, void FAR *in_desc, | 24 | in_func in, void FAR *in_desc, |
21 | out_func out, void FAR *out_desc)); | 25 | out_func out, void FAR *out_desc)); |
@@ -27,3 +31,7 @@ ZEXTERN int ZEXPORT inflateBack9Init_ OF((z_stream FAR *strm, | |||
27 | #define inflateBack9Init(strm, window) \ | 31 | #define inflateBack9Init(strm, window) \ |
28 | inflateBack9Init_((strm), (window), \ | 32 | inflateBack9Init_((strm), (window), \ |
29 | ZLIB_VERSION, sizeof(z_stream)) | 33 | ZLIB_VERSION, sizeof(z_stream)) |
34 | |||
35 | #ifdef __cplusplus | ||
36 | } | ||
37 | #endif | ||
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index 29bef6a..ac4575c 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* inftree9.c -- generate Huffman trees for efficient decoding | 1 | /* inftree9.c -- generate Huffman trees for efficient decoding |
2 | * Copyright (C) 1995-2003 Mark Adler | 2 | * Copyright (C) 1995-2005 Mark Adler |
3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
4 | */ | 4 | */ |
5 | 5 | ||
@@ -9,7 +9,7 @@ | |||
9 | #define MAXBITS 15 | 9 | #define MAXBITS 15 |
10 | 10 | ||
11 | const char inflate9_copyright[] = | 11 | const char inflate9_copyright[] = |
12 | " inflate9 1.2.2.2 Copyright 1995-2004 Mark Adler "; | 12 | " inflate9 1.2.2.3 Copyright 1995-2005 Mark Adler "; |
13 | /* | 13 | /* |
14 | If you use the zlib library in a product, an acknowledgment is welcome | 14 | If you use the zlib library in a product, an acknowledgment is welcome |
15 | in the documentation of your product. If for some reason you cannot | 15 | in the documentation of your product. If for some reason you cannot |
@@ -64,7 +64,7 @@ unsigned short FAR *work; | |||
64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | 64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, | 65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, |
66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, | 66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, |
67 | 133, 133, 133, 133, 144, 72, 199}; | 67 | 133, 133, 133, 133, 144, 66, 71}; |
68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ | 68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ |
69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, | 69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, |
70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, | 70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, |