diff options
| author | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:51 +0200 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2024-10-02 00:34:51 +0200 |
| commit | 48b34e07ef33965edcc38006082be01ed7ed239d (patch) | |
| tree | dc236a74a900921ab1fae039f655f1cb9aca7b6c /indra/media_plugins/base/media_plugin_base.h | |
| parent | 689f723a5f314ffa0f54c0e50a51cbe464b36ccf (diff) | |
| parent | 002a81ccf5a64fd08e29811a6edea36f2e0408be (diff) | |
Merge branch 'develop' into rlva/base
Diffstat (limited to 'indra/media_plugins/base/media_plugin_base.h')
| -rw-r--r-- | indra/media_plugins/base/media_plugin_base.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h index a084fc9834..98e9ce0316 100644 --- a/indra/media_plugins/base/media_plugin_base.h +++ b/indra/media_plugins/base/media_plugin_base.h @@ -38,7 +38,7 @@ struct SymbolToGrab { bool mRequired; char const *mName; - apr_dso_handle_sym_t *mPPFunc; + void **mPPFunc; }; class SymbolGrabber @@ -52,8 +52,7 @@ private: std::vector< SymbolToGrab > gSymbolsToGrab; bool sSymsGrabbed = false; - apr_pool_t *sSymDSOMemoryPool = nullptr; - std::vector<apr_dso_handle_t *> sLoadedLibraries; + std::vector<void *> sLoadedLibraries; }; extern SymbolGrabber gSymbolGrabber; @@ -63,7 +62,7 @@ extern SymbolGrabber gSymbolGrabber; #define LL_GRAB_SYM(SYMBOL_GRABBER, REQUIRED, SYMBOL_NAME, RETURN, ...) \ RETURN (*ll##SYMBOL_NAME)(__VA_ARGS__) = nullptr; \ size_t gRegistered##SYMBOL_NAME = SYMBOL_GRABBER.registerSymbol( \ - { REQUIRED, #SYMBOL_NAME , (apr_dso_handle_sym_t*)&ll##SYMBOL_NAME} \ + { REQUIRED, #SYMBOL_NAME , (void**)&ll##SYMBOL_NAME} \ ); #endif |