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 /capinfos.c | |
| parent | a196e90c3b3f0b0aeccc008208e2dcb91293baa3 (diff) | |
| download | wireshark-29ceca1b26e3507105f8038eb5cd5ca6bb4871cc.tar.gz wireshark-29ceca1b26e3507105f8038eb5cd5ca6bb4871cc.tar.bz2 wireshark-29ceca1b26e3507105f8038eb5cd5ca6bb4871cc.zip | |
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 'capinfos.c')
| -rw-r--r-- | capinfos.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/capinfos.c b/capinfos.c index 5adc480618..eda4f2090e 100644 --- a/capinfos.c +++ b/capinfos.c @@ -75,10 +75,23 @@ #include <glib.h> +#include <wsutil/privileges.h> + +/* + * The symbols declared in the below are exported from libwireshark, + * but we don't want to link whole libwireshark to editcap. + * We link the object directly instead and this needs a little trick + * with the WS_BUILD_DLL #define. + */ +#define WS_BUILD_DLL +#define RESET_SYMBOL_EXPORT #include <epan/packet.h> #include <epan/filesystem.h> #include <epan/plugins.h> #include <epan/report_err.h> +#undef WS_BUILD_DLL +#define RESET_SYMBOL_EXPORT + #include "wtap.h" #include <wsutil/privileges.h> #include <wsutil/str_util.h> |