diff options
author | Stig Bjørlykke <stig@bjorlykke.org> | 2009-12-19 15:39:16 +0000 |
---|---|---|
committer | Stig Bjørlykke <stig@bjorlykke.org> | 2009-12-19 15:39:16 +0000 |
commit | 5feb02cfa93b2581ea13261d0b71084cf63426a5 (patch) | |
tree | 59d2c24612a18d0852b3e30dbf7593280f0e453b /epan | |
parent | 5f736a63227976131ebc6a68238806f91327e5cd (diff) |
Rename some objects to avoid duplicate definitions.
svn path=/trunk/; revision=31324
Diffstat (limited to 'epan')
-rw-r--r-- | epan/dissectors/packet-x411.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/epan/dissectors/packet-x411.h b/epan/dissectors/packet-x411.h index 3e4fff6475..1edab5c800 100644 --- a/epan/dissectors/packet-x411.h +++ b/epan/dissectors/packet-x411.h @@ -63,14 +63,13 @@ #define err_new_credentials_unacceptable 6 #define err_old_credentials_incorrectly_specified 5 #define id_mhs_protocols "2.6.0" -#define id_mod id_mhs_protocols".0" +#define id_mhs_mod id_mhs_protocols".0" #define id_ac id_mhs_protocols".1" #define id_as id_mhs_protocols".2" #define id_ase id_mhs_protocols".3" -#define id_mod_object_identifiers id_mod".0" -#define id_mod_mts_access_protocol id_mod".1" -#define id_mod_ms_access_protocol id_mod".2" -#define id_mod_mts_transfer_protocol id_mod".3" +#define id_mod_mts_access_protocol id_mhs_mod".1" +#define id_mod_ms_access_protocol id_mhs_mod".2" +#define id_mod_mts_transfer_protocol id_mhs_mod".3" #define id_ac_mts_access_88 id_ac".0" #define id_ac_mts_forced_access_88 id_ac".1" #define id_ac_mts_reliable_access_88 id_ac".2" |