Wireshark-commits: [Wireshark-commits] master-2.2 345e78c: Always use the Windows time zone code on
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: Sun, 1 Jan 2017 05:21:21 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=345e78cefd1dab3bd24a8831d7d4fa304b530055
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master-2.2
Repository: wireshark

Commits:

345e78c by Guy Harris (guy@xxxxxxxxxxxx):

    Always use the Windows time zone code on Windows.
    
    We *have* to use the Windows code on Windows for the reasons given in
    the comment.  However, some versions of Visual Studio have a time.h that
    CMake thinks defines tzname[] (which the header will do under some
    circumstances), so HAVE_TZNAME gets defined on Windows.  We check for
    Windows *before* checking for HAVE_TZNAME - or HAVE_STRUCT_TM_TM_ZONE.
    
    Bug: 11785
    Change-Id: I61360daf08203dbd9d109a87c05727b4dbecea66
    Reviewed-on: https://code.wireshark.org/review/19483
    Petri-Dish: Guy Harris <guy@xxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    (cherry picked from commit 8909dff72139d2f0514a7bb83c6bf5c2959c4101)
    Reviewed-on: https://code.wireshark.org/review/19484
    

Actions performed:

    from  c0feb58   ENC: fix parsing of header broken by gee242bd
    adds  345e78c   Always use the Windows time zone code on Windows.


Summary of changes:
 epan/to_str.c |   54 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 29 insertions(+), 25 deletions(-)