Commit a47c9f2f authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files

Merge E_ and __VLC_SYMBOL

parent 79bfb76f
...@@ -61,10 +61,8 @@ ...@@ -61,10 +61,8 @@
/* If the module is built-in, then we need to define foo_InitModule instead /* If the module is built-in, then we need to define foo_InitModule instead
* of InitModule. Same for Activate- and DeactivateModule. */ * of InitModule. Same for Activate- and DeactivateModule. */
#ifdef __PLUGIN__ #ifdef __PLUGIN__
# define E_( function ) CONCATENATE( function, MODULE_SYMBOL )
# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL )
#else #else
# define E_( function ) CONCATENATE( function, MODULE_NAME )
# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME )
#endif #endif
...@@ -90,7 +88,7 @@ ...@@ -90,7 +88,7 @@
*/ */
#define vlc_module_begin( ) \ #define vlc_module_begin( ) \
EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \ EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \
E_(vlc_entry) ( module_t *p_module ); \ __VLC_SYMBOL(vlc_entry) ( module_t *p_module ); \
\ \
EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \ EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \
__VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \ __VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \
...@@ -455,7 +453,7 @@ enum vlc_config_properties ...@@ -455,7 +453,7 @@ enum vlc_config_properties
/* Meta data plugin exports */ /* Meta data plugin exports */
#define VLC_META_EXPORT( name, value ) \ #define VLC_META_EXPORT( name, value ) \
EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \ EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \
E_(vlc_entry_ ## name) (void); \ __VLC_SYMBOL(vlc_entry_ ## name) (void); \
EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \ EXTERN_SYMBOL DLL_SYMBOL const char * CDECL_SYMBOL \
__VLC_SYMBOL(vlc_entry_ ## name) (void) \ __VLC_SYMBOL(vlc_entry_ ## name) (void) \
{ \ { \
......
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