X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvlc_modules.h;h=06aefc01edd09dcfbf53afb468b3dfaae4aea960;hb=ca38797078238cc79861de8b79151df222e9c138;hp=a6c391a54cdec17802d92783d2e46b5acde698cf;hpb=71b6f8922627d87da8d2137e36c33bb9a4425095;p=vlc

diff --git a/include/vlc_modules.h b/include/vlc_modules.h
index a6c391a54c..06aefc01ed 100644
--- a/include/vlc_modules.h
+++ b/include/vlc_modules.h
@@ -33,47 +33,45 @@ typedef void (*vlc_deactivate_t)(void *func, va_list args);
  * Exported functions.
  *****************************************************************************/
 
-VLC_EXPORT( module_t *, vlc_module_load, ( vlc_object_t *obj, const char *cap, const char *name, bool strict, vlc_activate_t probe, ... ) LIBVLC_USED );
+VLC_API module_t * vlc_module_load( vlc_object_t *obj, const char *cap, const char *name, bool strict, vlc_activate_t probe, ... ) VLC_USED;
 #define vlc_module_load(o,c,n,s,...) \
         vlc_module_load(VLC_OBJECT(o),c,n,s,__VA_ARGS__)
-VLC_EXPORT( void, vlc_module_unload, ( module_t *, vlc_deactivate_t deinit, ... ) );
+VLC_API void vlc_module_unload( module_t *, vlc_deactivate_t deinit, ... );
 
-VLC_EXPORT( module_t *, module_need, ( vlc_object_t *, const char *, const char *, bool ) LIBVLC_USED );
+VLC_API module_t * module_need( vlc_object_t *, const char *, const char *, bool ) VLC_USED;
 #define module_need(a,b,c,d) module_need(VLC_OBJECT(a),b,c,d)
-VLC_EXPORT( void, module_unneed, ( vlc_object_t *, module_t * ) );
+VLC_API void module_unneed( vlc_object_t *, module_t * );
 #define module_unneed(a,b) module_unneed(VLC_OBJECT(a),b)
-VLC_EXPORT( bool,  module_exists, (const char *) LIBVLC_USED );
-VLC_EXPORT( module_t *, module_find, (const char *) LIBVLC_USED );
+VLC_API bool module_exists(const char *) VLC_USED;
+VLC_API module_t * module_find(const char *) VLC_USED;
 
-int module_start(vlc_object_t *, module_t *);
+int module_start(vlc_object_t *, const module_t *);
 #define module_start(o, m) module_start(VLC_OBJECT(o),m)
-void module_stop(vlc_object_t *, module_t *);
+void module_stop(vlc_object_t *, const module_t *);
 #define module_stop(o, m) module_stop(VLC_OBJECT(o),m)
 
-VLC_EXPORT( module_config_t *, module_config_get, ( const module_t *, unsigned * ) LIBVLC_USED );
-VLC_EXPORT( void, module_config_free, ( module_config_t * ) );
+VLC_API module_config_t * module_config_get( const module_t *, unsigned * ) VLC_USED;
+VLC_API void module_config_free( module_config_t * );
 
-VLC_EXPORT( module_t *, module_hold, (module_t *module) );
-VLC_EXPORT( void, module_release, (module_t *module) );
-VLC_EXPORT( void, module_list_free, (module_t **) );
-VLC_EXPORT( module_t **, module_list_get, (size_t *n) LIBVLC_USED );
+VLC_API void module_list_free(module_t **);
+VLC_API module_t ** module_list_get(size_t *n) VLC_USED;
 
-VLC_EXPORT( bool, module_provides, ( const module_t *m, const char *cap ) );
-VLC_EXPORT( const char *, module_get_object, ( const module_t *m ) LIBVLC_USED );
-VLC_EXPORT( const char *, module_get_name, ( const module_t *m, bool long_name ) LIBVLC_USED );
+VLC_API bool module_provides( const module_t *m, const char *cap );
+VLC_API const char * module_get_object( const module_t *m ) VLC_USED;
+VLC_API const char * module_get_name( const module_t *m, bool long_name ) VLC_USED;
 #define module_GetLongName( m ) module_get_name( m, true )
-VLC_EXPORT( const char *, module_get_help, ( const module_t *m ) LIBVLC_USED );
-VLC_EXPORT( const char *, module_get_capability, ( const module_t *m ) LIBVLC_USED );
-VLC_EXPORT( int, module_get_score, ( const module_t *m ) LIBVLC_USED );
-VLC_EXPORT( const char *, module_gettext, ( const module_t *, const char * ) LIBVLC_USED );
+VLC_API const char * module_get_help( const module_t *m ) VLC_USED;
+VLC_API const char * module_get_capability( const module_t *m ) VLC_USED;
+VLC_API int module_get_score( const module_t *m ) VLC_USED;
+VLC_API const char * module_gettext( const module_t *, const char * ) VLC_USED;
 
-LIBVLC_USED static inline module_t *module_get_main (void)
+VLC_USED static inline module_t *module_get_main (void)
 {
     return module_find ("main");
 }
 #define module_get_main(a) module_get_main()
 
-LIBVLC_USED static inline bool module_is_main( const module_t * p_module )
+VLC_USED static inline bool module_is_main( const module_t * p_module )
 {
     return !strcmp( module_get_object( p_module ), "main" );
 }