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

[Jeff Morriss <jeff.morriss.ws@xxxxxxxxx>]

Lines like "<<< .mine" indicate that Subversion detected a conflict 
between the changes you have in your version of the file and the changes 
that happened in SVN (see "svn help update", in particular the "C" 
status).  You have to manually resolve such conflicts before succesfully 
using SVN with that file again.

Also eth_stdio_fopen() needs to be exported from the dll because some 
plugins use it now.

Are you sure none of the other functions the patch removes are used by 
plugins?

Gisle Vanem wrote:
> 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