diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-02-13 13:51:05 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-02-14 19:46:42 +0000 |
| commit | e11d7ef08fc9b091e317d7cfd2abff1f21ca6276 (patch) | |
| tree | 16e8747c450db96d68b8c8e0aeda085dfe6d53cf /ui/gtk/bytes_view.h | |
| parent | 5cc0ad8672180128b32ef9e8f936011429665d88 (diff) | |
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@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/gtk/bytes_view.h')
| -rw-r--r-- | ui/gtk/bytes_view.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gtk/bytes_view.h b/ui/gtk/bytes_view.h index 2df3a6a9c4..bce61096bd 100644 --- a/ui/gtk/bytes_view.h +++ b/ui/gtk/bytes_view.h @@ -37,7 +37,7 @@ GtkWidget *bytes_view_new(void); void bytes_view_set_font(BytesView *bv, PangoFontDescription *font); void bytes_view_set_data(BytesView *bv, const guint8 *data, int len); -void bytes_view_set_encoding(BytesView *bv, int enc); +void bytes_view_set_encoding(BytesView *bv, packet_char_enc enc); void bytes_view_set_format(BytesView *bv, int format); void bytes_view_set_highlight_style(BytesView *bv, gboolean bold); |