diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-19 19:37:03 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2010-01-19 19:37:03 +0000 |
| commit | b38b39e6b2333a94eab3bef5b8ec71af5bf62417 (patch) | |
| tree | 4083fcbf1499c3b376b34133b76ef20e28e4fb58 /gtk/main_proto_draw.c | |
| parent | 315fa5ca83b7a1d6171c2923eae1f853ec264322 (diff) | |
Use more unique names for certain enum constants.
(enum constant names are part of the global name space).
(Fixes at least one gcc -Wshadow warning).
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31572 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'gtk/main_proto_draw.c')
| -rw-r--r-- | gtk/main_proto_draw.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c index f7e0da7e73..6c2724ed0b 100644 --- a/gtk/main_proto_draw.c +++ b/gtk/main_proto_draw.c @@ -1333,10 +1333,10 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart, while (i < k) { if (i < len) { - if (encoding == CHAR_ASCII) { + if (encoding == PACKET_CHAR_ENC_CHAR_ASCII) { c = pd[i]; } - else if (encoding == CHAR_EBCDIC) { + else if (encoding == PACKET_CHAR_ENC_CHAR_EBCDIC) { c = EBCDIC_to_ASCII1(pd[i]); } else { |