thrift: fix conflict
This commit is contained in:
parent
00179b710c
commit
71a21ca1ca
|
@ -3414,7 +3414,7 @@ proto_register_thrift(void)
|
||||||
NULL, HFILL }
|
NULL, HFILL }
|
||||||
},
|
},
|
||||||
{ &hf_thrift_num_set_pos,
|
{ &hf_thrift_num_set_pos,
|
||||||
{ "Number of Set Items", "thrift.num_set_item",
|
{ "Number of Set Items", "thrift.num_set_pos",
|
||||||
FT_UINT32, BASE_DEC, NULL, 0x0,
|
FT_UINT32, BASE_DEC, NULL, 0x0,
|
||||||
NULL, HFILL }
|
NULL, HFILL }
|
||||||
},
|
},
|
||||||
|
@ -3424,7 +3424,7 @@ proto_register_thrift(void)
|
||||||
NULL, HFILL }
|
NULL, HFILL }
|
||||||
},
|
},
|
||||||
{ &hf_thrift_num_list_pos,
|
{ &hf_thrift_num_list_pos,
|
||||||
{ "Number of List Items", "thrift.num_list_item",
|
{ "Number of List Items", "thrift.num_list_pos",
|
||||||
FT_UINT32, BASE_DEC, NULL, 0x0,
|
FT_UINT32, BASE_DEC, NULL, 0x0,
|
||||||
NULL, HFILL }
|
NULL, HFILL }
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue