diff options
author | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
---|---|---|
committer | Balint Reczey <balint@balintreczey.hu> | 2013-03-01 23:53:11 +0000 |
commit | 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 (patch) | |
tree | d6dde0ea7b6e6e15cc2c51a5f478fb85965b9720 /tools/make-dissector-reg.py | |
parent | 0b8d70bfb715bc3d89b6dfae86fc79d7c4387f02 (diff) | |
download | wireshark-1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322.tar.gz |
Export libwireshark symbols using WS_DLL_PUBLIC define
Also remove old WS_VAR_IMPORT define and related Makefile magic
everywhere in the project.
svn path=/trunk/; revision=47992
Diffstat (limited to 'tools/make-dissector-reg.py')
-rwxr-xr-x | tools/make-dissector-reg.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/tools/make-dissector-reg.py b/tools/make-dissector-reg.py index fe0e9a02d9..30351f203a 100755 --- a/tools/make-dissector-reg.py +++ b/tools/make-dissector-reg.py @@ -189,12 +189,16 @@ if registertype == "plugin" or registertype == "plugin_wtap": #include "moduleinfo.h" +/* plugins are DLLs */ +#define WS_BUILD_DLL +#include "ws_symbol_export.h" + #ifndef ENABLE_STATIC -G_MODULE_EXPORT const gchar version[] = VERSION; +WS_DLL_PUBLIC_NOEXTERN const gchar version[] = VERSION; /* Start the functions we need for the plugin stuff */ -G_MODULE_EXPORT void +WS_DLL_PUBLIC_NOEXTERN void plugin_register (void) { """ @@ -218,7 +222,7 @@ reg_code += "}\n" # Make the routine to register all protocol handoffs if registertype == "plugin" or registertype == "plugin_wtap": reg_code += """ -G_MODULE_EXPORT void +WS_DLL_PUBLIC_NOEXTERN void plugin_reg_handoff(void) { """ @@ -241,7 +245,7 @@ if registertype == "plugin": reg_code += "#endif\n" elif registertype == "plugin_wtap": reg_code += """ -G_MODULE_EXPORT void +WS_DLL_PUBLIC_NOEXTERN void register_wtap_module(void) { """ |