From 1ebdb2e521ca0cbd7aeebd1c89b8a5cf6a4cc322 Mon Sep 17 00:00:00 2001 From: Balint Reczey Date: Fri, 1 Mar 2013 23:53:11 +0000 Subject: 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 --- tools/make-dissector-reg.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'tools/make-dissector-reg.py') 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) { """ -- cgit v1.2.1