Wireshark · Wireshark-dev: [Wireshark-dev] [Patch] epan/libwireshark.def

[Gisle Vanem <gvanem@xxxxxxxxxxxx>]

What does the lines like "<<< .mine" do in this file?
Besides eth_stdio_fopen() shall not be exported from libwireshark.dll.
A patch:

--- SVN-Latest\epan\libwireshark.def    Wed Oct 31 17:03:44 2007
+++ epan\libwireshark.def       Wed Oct 31 17:31:01 2007
@@ -221,17 +221,10 @@
dissect_per_sequence
dissect_per_set_of
dissect_per_VisibleString
-<<<<<<< .mine
dissect_q932_PresentedNumberScreened
dissect_q932_PresentedNumberUnscreened
dissect_q932_PartyNumber
dissect_q932_PartySubaddress
-=======
-dissect_q932_PartyNumber
-dissect_q932_PartySubaddress
-dissect_q932_PresentedNumberUnscreened
-dissect_q932_PresentedNumberScreened
->>>>>>> .r23226
dissect_qsig_na_Name
dissect_rpc_array
dissect_rpc_bool
@@ -306,7 +299,6 @@
epan_get_version
epan_init
epan_strcasestr
-eth_stdio_fopen
ether_to_str
ex_opt_add
ex_opt_count
@@ -696,16 +688,11 @@
proto_tree_get_parent
proto_tree_get_root
proto_tree_move_item
-<<<<<<< .mine
+protocols_module               DATA
p_add_proto_data
p_get_proto_data
q931_cause_code_vals           DATA
q850_cause_code_vals           DATA
-=======
-protocols_module                DATA
-q850_cause_code_vals           DATA
-q931_cause_code_vals           DATA
->>>>>>> .r23226
q931_message_type_vals         DATA
range_convert_range
range_convert_str

--gv