vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Thu Jul 18 21:06:07 2019 +0300| [f5461b212a506e3bcfbae4f11cc465c01469da9e] | committer: Rémi Denis-Courmont
plugin: drop version suffix in exported symbols This is no longer needed. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=f5461b212a506e3bcfbae4f11cc465c01469da9e --- include/vlc_plugin.h | 4 +--- src/modules/bank.c | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 750be18deb..4ff6e86348 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -188,8 +188,6 @@ enum vlc_module_properties /** * Current plugin ABI version */ -# define MODULE_SYMBOL 4_0_4 -# define MODULE_SUFFIX "__4_0_4" #define VLC_API_VERSION_STRING "4.0.4" /***************************************************************************** @@ -211,7 +209,7 @@ enum vlc_module_properties /* If the module is built-in, then we need to define foo_InitModule instead * of InitModule. Same for Activate- and DeactivateModule. */ #ifdef __PLUGIN__ -# define VLC_SYMBOL(symbol) CONCATENATE(symbol, MODULE_SYMBOL) +# define VLC_SYMBOL(symbol) symbol # define VLC_MODULE_NAME_HIDDEN_SYMBOL \ const char vlc_module_name[] = MODULE_STRING; #else diff --git a/src/modules/bank.c b/src/modules/bank.c index f6f5ae1a85..8bc85b06ba 100644 --- a/src/modules/bank.c +++ b/src/modules/bank.c @@ -236,8 +236,6 @@ error: return handle; } -static const char vlc_entry_name[] = "vlc_entry" MODULE_SUFFIX; - /** * Loads a dynamically-linked plug-in into memory and initialize it. * @@ -255,7 +253,7 @@ static vlc_plugin_t *module_InitDynamic(vlc_object_t *obj, const char *path, return NULL; /* Try to resolve the symbol */ - vlc_plugin_cb entry = vlc_dlsym(handle, vlc_entry_name); + vlc_plugin_cb entry = vlc_dlsym(handle, "vlc_entry"); if (entry == NULL) { msg_Warn (obj, "cannot find plug-in entry point in %s", path); @@ -548,7 +546,7 @@ int module_Map(struct vlc_logger *log, vlc_plugin_t *plugin) if (handle == NULL) return -1; - vlc_plugin_cb entry = vlc_dlsym(handle, vlc_entry_name); + vlc_plugin_cb entry = vlc_dlsym(handle, "vlc_entry"); if (entry == NULL) { vlc_error(log, "cannot find plug-in entry point in %s", _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
