From Balint:
authorgerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 7 Mar 2013 17:20:12 +0000 (17:20 +0000)
committergerald <gerald@f5534014-38df-0310-8fa8-9805f1628bb7>
Thu, 7 Mar 2013 17:20:12 +0000 (17:20 +0000)
commitb3dcd0254e9f0bea1b3337f77af3f92d978423ec
tree0a094cc58d06b707af3e06662b9e7175df613033
parentc0378cb847256901899cc6ab0df78197fff613db
From Balint:

[PATCH 1/2] Revert "Try to fix the "LNK4217: locally defined symbol"
warnings.

This reverts commit r48158.

[PATCH 2/2] Employ small hack in editcap to link with a few objects from
libwireshark properly

From me:

Add the ability to reset symbol exports via ws_symbol_export.h's include
guard and do so in capinfos.c and editcap.c. We include ws_symbol_export.h
in over 200 files so it didn't seem to make sense to remove its include
guard entirely.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@48170 f5534014-38df-0310-8fa8-9805f1628bb7
Makefile.nmake
capinfos.c
editcap.c
ws_symbol_export.h