diff options
| author | Bill Meier <wmeier@newsguy.com> | 2010-01-19 19:37:03 +0000 |
|---|---|---|
| committer | Bill Meier <wmeier@newsguy.com> | 2010-01-19 19:37:03 +0000 |
| commit | e0064797fb53cb60feb32bdb316a902ccca6dd07 (patch) | |
| tree | 4083fcbf1499c3b376b34133b76ef20e28e4fb58 /epan/packet.h | |
| parent | 2efa26e0e1b9f75189b7a4f05abe3990870d6fe9 (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).
svn path=/trunk/; revision=31572
Diffstat (limited to 'epan/packet.h')
| -rw-r--r-- | epan/packet.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/packet.h b/epan/packet.h index 50b8f7965f..d68f80a976 100644 --- a/epan/packet.h +++ b/epan/packet.h @@ -79,9 +79,9 @@ typedef struct _packet_counts { /* Types of character encodings */ typedef enum { - CHAR_ASCII = 0, /* ASCII */ - CHAR_EBCDIC = 1 /* EBCDIC */ -} char_enc; + PACKET_CHAR_ENC_CHAR_ASCII = 0, /* ASCII */ + PACKET_CHAR_ENC_CHAR_EBCDIC = 1 /* EBCDIC */ +} packet_char_enc; extern void packet_init(void); extern void packet_cleanup(void); |