From 3a42716912dd1c4f17b46f983c5d698aa5fb808e Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Tue, 27 Jan 2009 22:03:53 +0200 Subject: [PATCH 1/1] Privatize vlc_module_create() --- include/vlc_plugin.h | 1 - src/libvlccore.sym | 1 - src/modules/modules.h | 2 ++ src/modules/os.c | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/vlc_plugin.h b/include/vlc_plugin.h index 7ec1cef487..76e630fb01 100644 --- a/include/vlc_plugin.h +++ b/include/vlc_plugin.h @@ -29,7 +29,6 @@ * This file implements plugin (module) macros used to define a vlc module. */ -VLC_EXPORT( module_t *, vlc_module_create, ( vlc_object_t * ) ); VLC_EXPORT( module_t *, vlc_submodule_create, ( module_t * ) ); VLC_EXPORT( int, vlc_module_set, (module_t *module, int propid, ...) ); VLC_EXPORT( module_config_t *, vlc_config_create, (module_t *, int type) ); diff --git a/src/libvlccore.sym b/src/libvlccore.sym index 4933f76b93..a96d9ec91a 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -473,7 +473,6 @@ __vlc_list_children vlc_list_release vlc_memcpy vlc_memset -vlc_module_create vlc_module_set vlc_mutex_destroy vlc_mutex_init diff --git a/src/modules/modules.h b/src/modules/modules.h index 74bc8f72fd..9d941bf184 100644 --- a/src/modules/modules.h +++ b/src/modules/modules.h @@ -146,6 +146,8 @@ struct module_t bool b_loaded; /* Set to true if the dll is loaded */ }; +module_t *vlc_module_create (vlc_object_t *); + #define module_InitBank(a) __module_InitBank(VLC_OBJECT(a)) void __module_InitBank ( vlc_object_t * ); #define module_LoadBuiltins(a) __module_LoadBuiltins(VLC_OBJECT(a)) diff --git a/src/modules/os.c b/src/modules/os.c index c40986fd2f..4a89127995 100644 --- a/src/modules/os.c +++ b/src/modules/os.c @@ -133,7 +133,7 @@ int module_Call( vlc_object_t *obj, module_t *p_module ) /* Make sure libvlccore is in the global namespace */ static void load_libvlccore( void ) { - if( !dlsym( RTLD_DEFAULT, "vlc_module_create" ) + if( !dlsym( RTLD_DEFAULT, "libvlc_Quit" ) && !dlopen( "libvlccore.so", RTLD_GLOBAL|RTLD_NOLOAD ) ) fprintf( stderr, "ERROR: failed loading libvlccore\n" ); } -- 2.39.2