aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-h245.h
diff options
context:
space:
mode:
authorBill Meier <wmeier@newsguy.com>2010-01-29 22:16:54 +0000
committerBill Meier <wmeier@newsguy.com>2010-01-29 22:16:54 +0000
commitcbec3dba8cb010910adaa561dfae7601d296ed62 (patch)
treec4b033ba7cf6c5dd5a996e52368e2596180d5a4e /epan/dissectors/packet-h245.h
parent080bbacb4185c5859049bdfeddc8fcb11de06eed (diff)
Fix two gcc -Wshadow warnings.
svn path=/trunk/; revision=31736
Diffstat (limited to 'epan/dissectors/packet-h245.h')
-rw-r--r--epan/dissectors/packet-h245.h24
1 files changed, 12 insertions, 12 deletions
diff --git a/epan/dissectors/packet-h245.h b/epan/dissectors/packet-h245.h
index 386f1d0775..6e314ae984 100644
--- a/epan/dissectors/packet-h245.h
+++ b/epan/dissectors/packet-h245.h
@@ -88,19 +88,19 @@ typedef struct {
} h223_lc_params;
typedef enum {
- nonStandardDataType,
- nullData,
- videoData,
- audioData,
- data,
- encryptionData,
+ H245_nonStandardDataType,
+ H245_nullData,
+ H245_videoData,
+ H245_audioData,
+ H245_data,
+ H245_encryptionData,
/*...,*/
- h235Control,
- h235Media,
- multiplexedStream,
- redundancyEncoding,
- multiplePayloadStream,
- fec
+ H245_h235Control,
+ H245_h235Media,
+ H245_multiplexedStream,
+ H245_redundancyEncoding,
+ H245_multiplePayloadStream,
+ H245_fec
} h245_lc_data_type_enum;
typedef struct {