From d8e17ad4f32d842b8754dd6a79c6a6ae0762646d Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 14 Apr 2007 17:31:01 +0000 Subject: [PATCH] Get rid of useless p_symbols --- include/vlc_modules.h | 8 ++++---- include/vlc_modules_macros.h | 10 +++++++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/vlc_modules.h b/include/vlc_modules.h index 633fdd29e8..7d15e58789 100644 --- a/include/vlc_modules.h +++ b/include/vlc_modules.h @@ -95,10 +95,10 @@ struct module_t 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 */ - /* - * Symbol table we send to the module so that it can access vlc symbols - */ +#ifndef HAVE_SHARED_LIBVLC + /* Legacy symbols table */ module_symbols_t *p_symbols; +#endif }; /***************************************************************************** @@ -129,5 +129,5 @@ enum VLC_MODULE_CB_OPEN, VLC_MODULE_CB_CLOSE, VLC_MODULE_UNLOADABLE -} vlc_module_property_t; +}; diff --git a/include/vlc_modules_macros.h b/include/vlc_modules_macros.h index c8f476e212..3a7642871c 100644 --- a/include/vlc_modules_macros.h +++ b/include/vlc_modules_macros.h @@ -59,12 +59,16 @@ #if defined( __BUILTIN__ ) # define E_( function ) CONCATENATE( function, MODULE_NAME ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME ) -# define DECLARE_SYMBOLS struct _u_n_u_s_e_d_ -# define STORE_SYMBOLS struct _u_n_u_s_e_d_ #elif defined( __PLUGIN__ ) # define E_( function ) CONCATENATE( function, MODULE_SYMBOL ) # define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL ) -# define DECLARE_SYMBOLS module_symbols_t* p_symbols +#endif + +#if defined( __BUILTIN__ ) || defined( HAVE_SHARED_LIBVLC ) +# define DECLARE_SYMBOLS struct _u_n_u_s_e_d_ +# define STORE_SYMBOLS struct _u_n_u_s_e_d_ +#else +# define DECLARE_SYMBOLS module_symbols_t* p_symbols = NULL # define STORE_SYMBOLS p_symbols = p_module->p_symbols #endif -- 2.39.2