Commit 8952d64a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remove vlc_symbols legacy.

parent 86b95f9d
...@@ -602,7 +602,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist, ...@@ -602,7 +602,7 @@ int vlc_scandir( const char *name, struct dirent ***namelist,
} }
#endif #endif
#if defined (WIN32) || !defined (HAVE_SHARED_LIBVLC) #ifdef WIN32
/***************************************************************************** /*****************************************************************************
* dgettext: gettext for plugins. * dgettext: gettext for plugins.
*****************************************************************************/ *****************************************************************************/
......
...@@ -35,9 +35,6 @@ module_t *vlc_module_create (vlc_object_t *obj) ...@@ -35,9 +35,6 @@ module_t *vlc_module_create (vlc_object_t *obj)
if (module == NULL) if (module == NULL)
return NULL; return NULL;
#ifndef HAVE_SHARED_LIBVLC
module->p_symbols = &vlc_global( obj )->p_module_bank->symbols;
#endif
module->b_reentrant = module->b_unloadable = VLC_TRUE; module->b_reentrant = module->b_unloadable = VLC_TRUE;
module->psz_object_name = module->psz_longname = default_name; module->psz_object_name = module->psz_longname = default_name;
module->pp_shortcuts[0] = default_name; module->pp_shortcuts[0] = default_name;
......
...@@ -196,13 +196,6 @@ void __module_InitBank( vlc_object_t *p_this ) ...@@ -196,13 +196,6 @@ void __module_InitBank( vlc_object_t *p_this )
p_bank->b_cache = p_bank->b_cache_dirty = p_bank->b_cache = p_bank->b_cache_dirty =
p_bank->b_cache_delete = VLC_FALSE; p_bank->b_cache_delete = VLC_FALSE;
/*
* Store the symbols to be exported
*/
#if defined (HAVE_DYNAMIC_PLUGINS) && !defined (HAVE_SHARED_LIBVLC)
STORE_SYMBOLS( &p_bank->symbols );
#endif
/* Everything worked, attach the object */ /* Everything worked, attach the object */
p_libvlc_global->p_module_bank = p_bank; p_libvlc_global->p_module_bank = p_bank;
vlc_object_attach( p_bank, p_libvlc_global ); vlc_object_attach( p_bank, p_libvlc_global );
...@@ -2207,9 +2200,6 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, ...@@ -2207,9 +2200,6 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache,
p_cache->pf_activate = p_module->pf_activate; p_cache->pf_activate = p_module->pf_activate;
p_cache->pf_deactivate = p_module->pf_deactivate; p_cache->pf_deactivate = p_module->pf_deactivate;
#ifndef HAVE_SHARED_LIBVLC
p_cache->p_symbols = p_module->p_symbols;
#endif
p_cache->handle = p_module->handle; p_cache->handle = p_module->handle;
for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ ) for( i_submodule = 0; i_submodule < p_module->i_children; i_submodule++ )
...@@ -2218,9 +2208,6 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache, ...@@ -2218,9 +2208,6 @@ static void CacheMerge( vlc_object_t *p_this, module_t *p_cache,
module_t *p_cchild = (module_t*)p_cache->pp_children[i_submodule]; module_t *p_cchild = (module_t*)p_cache->pp_children[i_submodule];
p_cchild->pf_activate = p_child->pf_activate; p_cchild->pf_activate = p_child->pf_activate;
p_cchild->pf_deactivate = p_child->pf_deactivate; p_cchild->pf_deactivate = p_child->pf_deactivate;
#ifndef HAVE_SHARED_LIBVLC
p_cchild->p_symbols = p_child->p_symbols;
#endif
} }
p_cache->b_loaded = VLC_TRUE; p_cache->b_loaded = VLC_TRUE;
......
...@@ -34,9 +34,6 @@ struct module_bank_t ...@@ -34,9 +34,6 @@ struct module_bank_t
VLC_COMMON_MEMBERS VLC_COMMON_MEMBERS
int i_usage; int i_usage;
#ifndef HAVE_SHARED_LIBVLC
module_symbols_t symbols;
#endif
vlc_bool_t b_main; vlc_bool_t b_main;
vlc_bool_t b_builtins; vlc_bool_t b_builtins;
...@@ -141,11 +138,6 @@ struct module_t ...@@ -141,11 +138,6 @@ struct module_t
vlc_bool_t b_builtin; /* Set to true if the module is built in */ vlc_bool_t b_builtin; /* Set to true if the module is built in */
vlc_bool_t b_loaded; /* Set to true if the dll is loaded */ vlc_bool_t b_loaded; /* Set to true if the dll is loaded */
#ifndef HAVE_SHARED_LIBVLC
/* Legacy symbols table */
module_symbols_t *p_symbols;
#endif
}; };
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment