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/tpg | |
| 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/tpg')
| -rw-r--r-- | plugins/tpg/packet-http.c | 6 |
1 files changed, 3 insertions, 3 deletions
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(); } |