diff options
| author | Guy Harris <guy@alum.mit.edu> | 2015-12-16 08:59:01 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2015-12-16 08:59:07 +0000 |
| commit | 6d60c4d4684c2c03a43f1b8720497348cf17d357 (patch) | |
| tree | 31c4eeb27100d4d42d942b85a8178cb167cf91d8 /epan/dissectors/packet-spdy.c | |
| parent | bfe73e3ad7162830c222a5b0d73433a72324baa5 (diff) | |
Revert "Make zlib API constness-aware"
This reverts commit fb0246c6fd7cd34b820558f75eb48bba6326b768. That commit assumes that if you define Z_CONST, z_const will be defined; that is *not* the case with older versions of zlib, which don't define z_const under any circumstances.
Change-Id: I6f9b7ea18922799b1aaf94dc2c63120128f2550a
Reviewed-on: https://code.wireshark.org/review/12671
Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'epan/dissectors/packet-spdy.c')
| -rw-r--r-- | epan/dissectors/packet-spdy.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/epan/dissectors/packet-spdy.c b/epan/dissectors/packet-spdy.c index 7bca0b2474..a16d4cf61d 100644 --- a/epan/dissectors/packet-spdy.c +++ b/epan/dissectors/packet-spdy.c @@ -42,7 +42,6 @@ #include "packet-ssl.h" #ifdef HAVE_LIBZ -#define ZLIB_CONST #include <zlib.h> #endif @@ -962,7 +961,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 = hptr; + decomp->next_in = (Bytef *)hptr; decomp->avail_in = length; decomp->next_out = uncomp_block; decomp->avail_out = DECOMPRESS_BUFSIZE; |