On Sun, Feb 04, 2007 at 02:23:11AM +0100, Sebastien Tandel wrote:
> Here are two patches to resolve conflicts for g_strsplit with glib2
> and glib1.2. The first one (ws_strsplit.diff) creates
> ws_strsplit.[c,h] in the epan repository but I'm not sure this is the
> right place as potentially used anywhere in the code of wireshark.
>
> The second patch (ws_strsplit-inclusion.diff) includes ws_strsplit.h
> in C files using g_strsplit. I've also deleted the specific code to
> gtk1.2 in epan/stats_tree.c
Your changes have been committed as SVN revision 20804. FYI: I added a
note to README.developer under Portability/String handling about
including ws_strsplit.h whenever using g_strsplit. I also added
ws_strsplit to libwireshark.def so it can be exported out of
libwireshark to the other parts of Wireshark (namely the GTK GUI), which
Windows compilation usually needs in such cases. I've tested the
changes on Unix (both GTK2 and GTK1) and Windows (GTK2/GTK1).
Thanks for your contribution!
Steve
