Wireshark-commits: [Wireshark-commits] master-2.6 cfeadc6: Don't look for zlib stuff if we didn't f
Date Index · Thread Index · Other Months · All Mailing Lists
Date Prev · Date Next · Thread Prev · Thread Next
From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 25 Apr 2019 04:16:12 +0000
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=cfeadc69ff7f2f73ccd3026d7d8138904078d6aa
Submitter: "Guy Harris <guy@xxxxxxxxxxxx>"
Changed: branch: master-2.6
Repository: wireshark

Commits:

cfeadc6 by Guy Harris (guy@xxxxxxxxxxxx):

    Don't look for zlib stuff if we didn't find zlib.
    
    If we didn't find zlib, don't look for its version number in zlib.h, and
    don't look for inflate() or inflatePrime() in the library.
    
    Trim off some trailing blank lines while we're at it.
    
    Change-Id: I834a9a76928a00cf5e182bd4224ebc91d36d69a4
    Reviewed-on: https://code.wireshark.org/review/32973
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit c66994215b4f0344d7ec6f9340ed79e647053018)
    Reviewed-on: https://code.wireshark.org/review/32977
    

Actions performed:

    from  c13930a   packet: ensure pinfo->curr_layer_num does not depend on tree
     add  cfeadc6   Don't look for zlib stuff if we didn't find zlib.


Summary of changes:
 cmake/modules/FindZLIB.cmake | 98 ++++++++++++++++++++++----------------------
 1 file changed, 50 insertions(+), 48 deletions(-)