diff options
Diffstat (limited to 'indra/media_plugins/base/media_plugin_base.h')
| -rw-r--r-- | indra/media_plugins/base/media_plugin_base.h | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h index 2e975a5bf2..571dd3bd1b 100644 --- a/indra/media_plugins/base/media_plugin_base.h +++ b/indra/media_plugins/base/media_plugin_base.h @@ -52,12 +52,21 @@ private: std::vector< SymbolToGrab > gSymbolsToGrab; bool sSymsGrabbed = false; - apr_pool_t *sSymPADSOMemoryPool = nullptr; + apr_pool_t *sSymDSOMemoryPool = nullptr; std::vector<apr_dso_handle_t *> sLoadedLibraries; }; extern SymbolGrabber gSymbolGrabber; -#define LL_GRAB_SYM(REQUIRED, SYMBOL_NAME, RETURN, ...) RETURN (*ll##SYMBOL_NAME)(__VA_ARGS__) = nullptr; size_t gRegistered##SYMBOL_NAME = gSymbolGrabber.registerSymbol( { REQUIRED, #SYMBOL_NAME , (apr_dso_handle_sym_t*)&ll##SYMBOL_NAME} ); + +// extern SymbolGrabber gSymbolGrabber; + +#define LL_SYMBOL_GRABBER gSymbolGrabber + +#define LL_GRAB_SYM(REQUIRED, SYMBOL_NAME, RETURN, ...) \ + RETURN (*ll##SYMBOL_NAME)(__VA_ARGS__) = nullptr; \ + size_t gRegistered##SYMBOL_NAME = LL_SYMBOL_GRABBER.registerSymbol( \ + { REQUIRED, #SYMBOL_NAME , (apr_dso_handle_sym_t*)&ll##SYMBOL_NAME} \ + ); #endif @@ -153,4 +162,7 @@ int init_media_plugin( LLPluginInstance::sendMessageFunction *plugin_send_func, void **plugin_user_data); - +#if LL_LINUX +pid_t getParentPid(pid_t aPid); +bool isPluginPid(pid_t aPid); +#endif
\ No newline at end of file |