diff options
| author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2015-11-30 17:35:34 +0000 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-12-16 05:40:41 +0000 |
| commit | fb0246c6fd7cd34b820558f75eb48bba6326b768 (patch) | |
| tree | e4e3acd0e25331e71d5521c6af6f1ed6a5dff089 /epan/dissectors/packet-spdy.c | |
| parent | c7ac304e7487489e9a32847ec3f5e253b7d81625 (diff) | |
Make zlib API constness-aware
ZLIB_CONST must be defined before including zlib.h to expose 'z_const'.
Change-Id: Ic0dbd59ed3c760dd84ef4546f6ff4d5d3db91519
Reviewed-on: https://code.wireshark.org/review/12547
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Peter Wu <peter@lekensteyn.nl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-spdy.c')
| -rw-r--r-- | epan/dissectors/packet-spdy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index a16d4cf61d..7bca0b2474 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -42,6 +42,7 @@ #include "packet-ssl.h" #ifdef HAVE_LIBZ +#define ZLIB_CONST #include <zlib.h> #endif @@ -961,7 +962,7 @@ static guint8* spdy_decompress_header_block(tvbuff_t *tvb, const guint8 *hptr = tvb_get_ptr(tvb, offset, length); guint8 *uncomp_block = (guint8 *)wmem_alloc(wmem_packet_scope(), DECOMPRESS_BUFSIZE); - decomp->next_in = (Bytef *)hptr; + decomp->next_in = hptr; decomp->avail_in = length; decomp->next_out = uncomp_block; decomp->avail_out = DECOMPRESS_BUFSIZE; |