diff options
| author | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
|---|---|---|
| committer | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
| commit | 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 (patch) | |
| tree | d6dde0ea7b6e6e15cc2c51a5f478fb85965b9720 /plugins/tpg | |
| parent | 0b8d70bfb715bc3d89b6dfae86fc79d7c4387f02 (diff) | |
| download | wireshark-1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322.tar.gz | |
Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.
svn path=/trunk/; revision=47992
Diffstat (limited to 'plugins/tpg')
| -rw-r--r-- | plugins/tpg/Makefile.nmake | 2 | ||||
| -rw-r--r-- | plugins/tpg/packet-http.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/tpg/Makefile.nmake b/plugins/tpg/Makefile.nmake index 22c9334564..ae64ff59ad 100644 --- a/plugins/tpg/Makefile.nmake +++ b/plugins/tpg/Makefile.nmake @@ -20,7 +20,7 @@ LDFLAGS = $(PLUGIN_LDFLAGS) !IFDEF ENABLE_LIBWIRESHARK LINK_PLUGIN_WITH=..\..\epan\libwireshark.lib -CFLAGS=/D_NEED_VAR_IMPORT_ $(CFLAGS) +CFLAGS=$(CFLAGS) OBJECTS=packet-mate.obj\ mate_setup.obj\ diff --git a/plugins/tpg/packet-http.c b/plugins/tpg/packet-http.c index 13d01930b7..841d453761 100644 --- a/plugins/tpg/packet-http.c +++ b/plugins/tpg/packet-http.c @@ -122,9 +122,9 @@ static void proto_reg_handoff_http(void) { #ifndef ENABLE_STATIC -G_MODULE_EXPORT const gchar version[] = "0.0.0"; +WS_DLL_PUBLIC_NOEXTERN const gchar version[] = "0.0.0"; -G_MODULE_EXPORT void +WS_DLL_PUBLIC_NOEXTERN void plugin_register(void) { /* register the new protocol, protocol fields, and subtrees */ @@ -133,7 +133,7 @@ plugin_register(void) } } -G_MODULE_EXPORT void +WS_DLL_PUBLIC_NOEXTERN void plugin_reg_handoff(void){ proto_reg_handoff_http(); } |