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/make-dissector-reg.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/make-dissector-reg.py')
-rwxr-xr-x | tools/make-dissector-reg.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py index 8e1134d19e..150097204a 100755 --- a/tools/make-dissector-reg.py +++ b/tools/make-dissector-reg.py @@ -195,11 +195,11 @@ if registertype == "plugin" or registertype == "plugin_wtap": #include "ws_symbol_export.h" #ifndef ENABLE_STATIC -WS_DLL_PUBLIC_NOEXTERN const gchar version[] = VERSION; +WS_DLL_PUBLIC_DEF const gchar version[] = VERSION; /* Start the functions we need for the plugin stuff */ -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void plugin_register (void) { """ @@ -223,7 +223,7 @@ reg_code += "}\n" # Make the routine to register all protocol handoffs if registertype == "plugin" or registertype == "plugin_wtap": reg_code += """ -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void plugin_reg_handoff(void) { """ @@ -246,7 +246,7 @@ if registertype == "plugin": reg_code += "#endif\n" elif registertype == "plugin_wtap": reg_code += """ -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void register_wtap_module(void) { """ |