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

URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=e11d7ef08fc9b091e317d7cfd2abff1f21ca6276
Submitter: Gerald Combs (gerald@xxxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

e11d7ef by Gerald Combs (gerald@xxxxxxxxxxxxx):

    Fix diagnostics macros and squelch a gcc warning.
    
    Both clang and gcc define __GNUC__. Make sure we account for that when
    defining diagnostic macros.
    
    Use DIAG_OFF + DIAG_ON to suppress gcc -pedantic warnings about
    frame_data.
    
    Get rid of packet_char_enc casts.
    
    Change-Id: Idbcc61bcdb35c1d20f185461c69451dcdf73bae9
    Reviewed-on: https://code.wireshark.org/review/7106
    Petri-Dish: Gerald Combs <gerald@xxxxxxxxxxxxx>
    Tested-by: Petri Dish Buildbot <buildbot-no-reply@xxxxxxxxxxxxx>
    Reviewed-by: Gerald Combs <gerald@xxxxxxxxxxxxx>
    

Actions performed:

    from  5cc0ad8   Remove a duplicate typedef.
    adds  e11d7ef   Fix diagnostics macros and squelch a gcc warning.


Summary of changes:
 epan/frame_data.h        |    3 +++
 epan/print.c             |    4 ++--
 ui/gtk/bytes_view.c      |    6 ++----
 ui/gtk/bytes_view.h      |    2 +-
 ui/gtk/packet_panes.c    |    7 ++++---
 wsutil/ws_diag_control.h |    2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)