From d09ec5e87bfd892306ccdba56944583bd9213aaf Mon Sep 17 00:00:00 2001 From: Maki Date: Sat, 20 Apr 2024 18:34:09 -0400 Subject: Rework macro magic for symbol grabber --- indra/media_plugins/base/media_plugin_base.h | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'indra/media_plugins/base/media_plugin_base.h') diff --git a/indra/media_plugins/base/media_plugin_base.h b/indra/media_plugins/base/media_plugin_base.h index 571dd3bd1b..10c3b67235 100644 --- a/indra/media_plugins/base/media_plugin_base.h +++ b/indra/media_plugins/base/media_plugin_base.h @@ -60,11 +60,9 @@ extern SymbolGrabber gSymbolGrabber; // extern SymbolGrabber gSymbolGrabber; -#define LL_SYMBOL_GRABBER gSymbolGrabber - -#define LL_GRAB_SYM(REQUIRED, SYMBOL_NAME, RETURN, ...) \ +#define LL_GRAB_SYM(SYMBOL_GRABBER, REQUIRED, SYMBOL_NAME, RETURN, ...) \ RETURN (*ll##SYMBOL_NAME)(__VA_ARGS__) = nullptr; \ - size_t gRegistered##SYMBOL_NAME = LL_SYMBOL_GRABBER.registerSymbol( \ + size_t gRegistered##SYMBOL_NAME = SYMBOL_GRABBER.registerSymbol( \ { REQUIRED, #SYMBOL_NAME , (apr_dso_handle_sym_t*)&ll##SYMBOL_NAME} \ ); -- cgit v1.2.3