* if user has #defined MODULE_NAME foo, then we will need:
* #define MODULE_STRING "foo"
*
- * and, if __BUILTIN__ is set, we will also need:
+ * and, if HAVE_DYNAMIC_PLUGINS is NOT set, we will also need:
* #define MODULE_FUNC( zog ) module_foo_zog
*
* this can't easily be done with the C preprocessor, thus a few ugly hacks.
/* If the module is built-in, then we need to define foo_InitModule instead
* of InitModule. Same for Activate- and DeactivateModule. */
-#if defined( __BUILTIN__ )
-# define E_( function ) CONCATENATE( function, MODULE_NAME )
-# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME )
-#elif defined( __PLUGIN__ )
+#if defined (HAVE_DYNAMIC_PLUGINS) && !defined (__BUILTIN__)
# define E_( function ) CONCATENATE( function, MODULE_SYMBOL )
# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_SYMBOL )
-#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
+# define E_( function ) CONCATENATE( function, MODULE_NAME )
+# define __VLC_SYMBOL( symbol ) CONCATENATE( symbol, MODULE_NAME )
#endif
#if defined( __PLUGIN__ ) && ( defined( WIN32 ) || defined( UNDER_CE ) )
#endif
#define vlc_module_begin( ) \
- DECLARE_SYMBOLS; \
EXTERN_SYMBOL DLL_SYMBOL int CDECL_SYMBOL \
__VLC_SYMBOL(vlc_entry) ( module_t *p_module ) \
{ \
int i_shortcut = 1, res; \
size_t i_config = (size_t)(-1); \
module_config_t *p_config = NULL; \
- STORE_SYMBOLS; \
if (vlc_module_set (p_module, VLC_MODULE_NAME, \
(void *)(MODULE_STRING))) \
goto error; \
#define set_description( desc ) \
if (vlc_module_set (p_submodule, VLC_MODULE_DESCRIPTION, (void*)(desc))) \
- goto error;
+ goto error
#define set_help( help ) \
if (vlc_module_set (p_submodule, VLC_MODULE_HELP, (void*)(help))) \