Browse Source

plugin: drop version suffix in exported symbols

This is no longer needed.
pull/94/head
Rémi Denis-Courmont 7 years ago
parent
commit
f5461b212a
  1. 4
      include/vlc_plugin.h
  2. 6
      src/modules/bank.c

4
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

6
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",

Loading…
Cancel
Save