URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=2943ac5381ed424348c66db76cd6869dbdf71710
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark
Commits:
2943ac5 by Guy Harris (guy@xxxxxxxxxxxx):
Make zlib API constness-aware, take 2.
ZLIB_CONST must be defined before including zlib.h to expose z_const,
*AND* z_const shouldn't be used unless it's defined, because older
versions of zlib don't define it even if you define ZLIB_CONST.
While we're at it, throw in some DIAG_OFF(cast-qual)/DIAG_ON(cast-qual)
pairs to suppress unavoidable "cast throws away const qualification"
warnings.
The original "make zlib constness-aware" change also removed an
unnecessary include of <zlib.h> from wiretap/wtap.c, so we do that as
well.
Change-Id: I3c5269a8fbc54bbbb4d316544cc7b8fa30614c19
Reviewed-on: https://code.wireshark.org/review/12675
Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
Actions performed:
from 6d60c4d Revert "Make zlib API constness-aware"
adds 2943ac5 Make zlib API constness-aware, take 2.
Summary of changes:
epan/dissectors/packet-spdy.c | 7 +++++++
epan/tvbuff_zlib.c | 1 +
wiretap/file_wrappers.c | 18 +++++++++++++++++-
wiretap/wtap.c | 4 ----
4 files changed, 25 insertions(+), 5 deletions(-)