From a47c9f2f1ed05ce552032639bf3bfa02d47a9012 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 21 Sep 2008 19:15:42 +0300 Subject: [PATCH] Merge E_ and __VLC_SYMBOL --- include/vlc_plugin.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 57dc998fc4..b98cfd40cc 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -61,10 +61,8 @@ /* If the module is built-in, then we need to define foo_InitModule instead * of InitModule. Same for Activate- and DeactivateModule. */ #ifdef __PLUGIN__ -# define E_( function ) CONCATENATE( function, MODULE_SYMBOL ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL ) #else -# define E_( function ) CONCATENATE( function, MODULE_NAME ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME ) #endif @@ -90,7 +88,7 @@ */ #define vlc_module_begin( ) \ 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 \ __VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \ @@ -455,7 +453,7 @@ enum vlc_config_properties /* Meta data plugin exports */ #define VLC_META_EXPORT( name, value ) \ 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 \ __VLC_SYMBOL(vlc_entry_ ## name) (void) \ { \ -- 2.39.2