That seems to work much better, thanks for the quick fix.
I still get the following set of warnings several times in a row:
../..\epan/except.h(98) : warning C4005: 'except_code' : macro
redefinition
../..\plugins/plugin_api.h(281) : see previous definition of
'except_code'
../..\epan/except.h(99) : warning C4005: 'except_group' : macro
redefinition
../..\plugins/plugin_api.h(282) : see previous definition of
'except_group'
../..\epan/except.h(100) : warning C4005: 'except_message' : macro
redefinition
../..\plugins/plugin_api.h(283) : see previous definition of
'except_message'
../..\epan/except.h(101) : warning C4005: 'except_data' : macro
redefinition
../..\plugins/plugin_api.h(284) : see previous definition of
'except_data'
Guy Harris wrote:
>
> On Wed, Apr 30, 2003 at 06:22:49PM -0400, Jason House wrote:
> > I tracked down one symptom as being definitions inside of
> > plugins/plugin_table.h conflicting with epan/except.h ...
> > The attached patch helped
>
> ...but it's not the right fix. All the typedefs in
> "plugins/plugin_table.h" must have "addr_" in their name in front of the
> function name; the new ones didn't.
>
> I checked in a fix to put the "addr_" in there - and to eliminate the
> duplicate "addr_except_throw" and code for that duplicate entry (we were
> already exporting it).
>
> Try removing your patch to epan/plugin_table.h, doing a CVS update, and
> trying that.
