diff --git a/epan/Makefile.am b/epan/Makefile.am index 1981a204fc..4de9a1a287 100644 --- a/epan/Makefile.am +++ b/epan/Makefile.am @@ -192,7 +192,7 @@ def_sym_filter_symbols = if !HAVE_PLUGINS # If we're not building plugins, these symbols don't get built. # Keep them out of the symbol list. -def_sym_filter_symbols += /^register_all_wiretap_modules/ || /^register_all_plugin_tap_listeners/ || /^plugin_list/ {next;}; +def_sym_filter_symbols += /^register_all_plugin_tap_listeners/ || /^plugin_list/ {next;}; endif if !HAVE_LIBPY diff --git a/epan/libwireshark.def b/epan/libwireshark.def index 78f00ffac4..5e83b94442 100644 --- a/epan/libwireshark.def +++ b/epan/libwireshark.def @@ -910,7 +910,6 @@ reassembled_table_init register_all_plugin_tap_listeners register_all_protocols register_all_protocol_handoffs -register_all_wiretap_modules register_ber_oid_dissector register_ber_oid_dissector_handle register_ber_oid_syntax diff --git a/epan/plugins.c b/epan/plugins.c index 3042a65374..d7695cc839 100644 --- a/epan/plugins.c +++ b/epan/plugins.c @@ -60,6 +60,9 @@ wslua_plugin *wslua_plugin_list = NULL; /* linked list of all plugins */ plugin *plugin_list = NULL; +static void register_all_wiretap_modules(void); +static void register_all_codecs(void); + /* * add a new plugin to the list * returns : @@ -475,7 +478,7 @@ register_all_plugin_tap_listeners(void) } } -void +static void register_all_wiretap_modules(void) { plugin *pt_plug; @@ -491,7 +494,7 @@ register_all_wiretap_modules(void) } } -void +static void register_all_codecs(void) { plugin *pt_plug; diff --git a/epan/plugins.h b/epan/plugins.h index ffa2672402..0892857d17 100644 --- a/epan/plugins.h +++ b/epan/plugins.h @@ -52,8 +52,6 @@ extern void init_plugins(void); extern void register_all_plugin_registrations(void); extern void register_all_plugin_handoffs(void); extern void register_all_plugin_tap_listeners(void); -extern void register_all_wiretap_modules(void); -extern void register_all_codecs(void); extern void plugins_dump_all(void); typedef struct _wslua_plugin {