diff options
| author | Gerald Combs <gerald@wireshark.org> | 2013-03-07 17:20:12 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2013-03-07 17:20:12 +0000 |
| commit | 29ceca1b26e3507105f8038eb5cd5ca6bb4871cc (patch) | |
| tree | 0a094cc58d06b707af3e06662b9e7175df613033 /ws_symbol_export.h | |
| parent | a196e90c3b3f0b0aeccc008208e2dcb91293baa3 (diff) | |
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.
svn path=/trunk/; revision=48170
Diffstat (limited to 'ws_symbol_export.h')
| -rw-r--r-- | ws_symbol_export.h | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/ws_symbol_export.h b/ws_symbol_export.h index ac9b973053..f17136aba2 100644 --- a/ws_symbol_export.h +++ b/ws_symbol_export.h @@ -20,6 +20,30 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ +/** Reset symbol export behavior. + * If you {un}define WS_BUILD_DLL on the fly you'll have to define this + * as well. + */ +#ifdef RESET_SYMBOL_EXPORT + +#ifdef SYMBOL_EXPORT_H +#undef SYMBOL_EXPORT_H +#endif + +#ifdef WS_DLL_PUBLIC +#undef WS_DLL_PUBLIC +#endif + +#ifdef WS_DLL_PUBLIC_NOEXTERN +#undef WS_DLL_PUBLIC_NOEXTERN +#endif + +#ifdef WS_DLL_LOCAL +#undef WS_DLL_LOCAL +#endif + +#endif /* RESET_SYMBOL_EXPORT */ + #ifndef SYMBOL_EXPORT_H #define SYMBOL_EXPORT_H |