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 /tools/wireshark_gen.py | |
| parent | a3543e605022d4385d536cd4f916d9a29051e637 (diff) | |
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 'tools/wireshark_gen.py')
| -rwxr-xr-x | tools/wireshark_gen.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/wireshark_gen.py b/tools/wireshark_gen.py index def0b30214..41048415d8 100755 --- a/tools/wireshark_gen.py +++ b/tools/wireshark_gen.py @@ -1976,7 +1976,7 @@ static guint32 boundary = GIOP_HEADER_SIZE; /* initial value */""" template_plugin_register = """ #if 0 -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void plugin_register(void) { if (proto_@dissector_name@ == -1) { @@ -1984,7 +1984,7 @@ plugin_register(void) } } -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void plugin_reg_handoff(void){ proto_register_handoff_giop_@dissector_name@(); } |