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 | |
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')
-rwxr-xr-x | tools/make-dissector-reg | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/make-dissector-reg b/tools/make-dissector-reg index a4552884cf..6233561c4a 100755 --- a/tools/make-dissector-reg +++ b/tools/make-dissector-reg @@ -47,11 +47,11 @@ then #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) { EOF @@ -119,7 +119,7 @@ echo '}' >>${outfile}-tmp if [ "$registertype" = plugin ] then cat <<"EOF" >>${outfile}-tmp -WS_DLL_PUBLIC_NOEXTERN void +WS_DLL_PUBLIC_DEF void plugin_reg_handoff(void) { EOF |