[Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>]

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=6d60c4d4684c2c03a43f1b8720497348cf17d357
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

6d60c4d by Guy Harris (guy@xxxxxxxxxxxx):

    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@xxxxxxxxxxxx>
    

Actions performed:

    from  bfe73e3   Qt: save custom colors in recent_common file
    adds  6d60c4d   Revert "Make zlib API constness-aware"


Summary of changes:
 epan/dissectors/packet-spdy.c |    3 +--
 epan/tvbuff_zlib.c            |    1 -
 wiretap/file_wrappers.c       |    9 ++++++---
 wiretap/wtap.c                |    4 ++++
 4 files changed, 11 insertions(+), 6 deletions(-)