diff options
| author | Guy Harris <guy@alum.mit.edu> | 2013-07-03 01:43:39 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2013-07-03 01:43:39 +0000 |
| commit | 5d87a8c46171f572568db5a47c093423482e342f (patch) | |
| tree | 07a700792f034ede91c707b927cd94f4887d5394 /plugins | |
| parent | a3543e605022d4385d536cd4f916d9a29051e637 (diff) | |
| download | wireshark-5d87a8c46171f572568db5a47c093423482e342f.tar.gz | |
WS_DLL_PUBLIC is now always WS_DLL_PUBLIC_NOEXTERN with "extern" added;
just define WS_DLL_PUBLIC_NOEXTERN inside the ifdefs, and define
WS_DLL_PUBLIC as WS_DLL_PUBLIC_NOEXTERN followed by "extern".
Then rename WS_DLL_PUBLIC_NOEXTERN to WS_DLL_PUBLIC_DEF, to clarify that
it's what should be used for definitions; at least on Windows, you
*have* to use it when declaring arrays without a size, and, whilst you
might be able to use WS_DLL_PUBLIC for definitions of functions and
perhaps data definitions other than no-size arrays, it might be clearer
to rename WS_DLL_PUBLIC to WS_DLL_PUBLIC_DECL and use it only for
declarations.
svn path=/trunk/; revision=50334
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/easy_codec/easy_codec_plugin.c | 4 | ||||
| -rw-r--r-- | plugins/stats_tree/stats_tree_plugin.c | 4 | ||||
| -rw-r--r-- | plugins/tpg/packet-http.c | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/plugins/easy_codec/easy_codec_plugin.c b/plugins/easy_codec/easy_codec_plugin.c index ac21f41da0..2e586787ce 100644 --- a/plugins/easy_codec/easy_codec_plugin.c +++ b/plugins/easy_codec/easy_codec_plugin.c @@ -37,9 +37,9 @@ #include "codec-g729a.h" #include "codec-g722.h" -WS_DLL_PUBLIC_NOEXTERN const gchar version[] = "0.0.1"; +WS_DLL_PUBLIC_DEF const gchar version[] = "0.0.1"; -WS_DLL_PUBLIC_NOEXTERN void register_codec_module(void) +WS_DLL_PUBLIC_DEF void register_codec_module(void) { register_codec("g723", codec_g7231_init, codec_g7231_release, codec_g7231_decode); register_codec("g729", codec_g729a_init, codec_g729a_release, codec_g729a_decode); diff --git a/plugins/stats_tree/stats_tree_plugin.c b/plugins/stats_tree/stats_tree_plugin.c index ff17819356..b25e8f91a9 100644 --- a/plugins/stats_tree/stats_tree_plugin.c +++ b/plugins/stats_tree/stats_tree_plugin.c @@ -36,9 +36,9 @@ #include "pinfo_stats_tree.h" -WS_DLL_PUBLIC_NOEXTERN const gchar version[] = "0.0.1"; +WS_DLL_PUBLIC_DEF const gchar version[] = "0.0.1"; -WS_DLL_PUBLIC_NOEXTERN void plugin_register_tap_listener(void) +WS_DLL_PUBLIC_DEF void plugin_register_tap_listener(void) { register_pinfo_stat_trees(); } diff --git a/plugins/tpg/packet-http.c b/plugins/tpg/packet-http.c index 841d453761..b15219892d 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 -WS_DLL_PUBLIC_NOEXTERN const gchar version[] = "0.0.0"; +WS_DLL_PUBLIC_DEF const gchar version[] = "0.0.0"; -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void plugin_register(void) { /* register the new protocol, protocol fields, and subtrees */ @@ -133,7 +133,7 @@ plugin_register(void) } } -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void plugin_reg_handoff(void){ proto_reg_handoff_http(); } |