diff options
| author | Andre Heider | 2010-09-15 07:43:16 +0000 |
|---|---|---|
| committer | Andre Heider | 2010-09-15 07:43:16 +0000 |
| commit | 41834499edb64965058dea33f1a3176810c52d88 (patch) | |
| tree | be351979a751694b3412961719c78df07405dbfe /base | |
| parent | fd4189180da1faee7ac50d13757987bb9625b1ed (diff) | |
| download | scummvm-rg350-41834499edb64965058dea33f1a3176810c52d88.tar.gz scummvm-rg350-41834499edb64965058dea33f1a3176810c52d88.tar.bz2 scummvm-rg350-41834499edb64965058dea33f1a3176810c52d88.zip | |
PLUGINS: Cleanup.
- Unify ELF loader handling in configure
- Rename ELF_LOADER_TARGET to USE_ELF_LOADER
svn-id: r52728
Diffstat (limited to 'base')
| -rw-r--r-- | base/plugins.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/base/plugins.h b/base/plugins.h index d4728d8a4c..0893312102 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -91,10 +91,11 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX]; (ENABLE_##ID && (ENABLE_##ID == DYNAMIC_PLUGIN) && DYNAMIC_MODULES) // see comments in backends/plugins/elf/elf-provider.cpp -#if defined(ELF_LOADER_TARGET) && defined(ELF_LOADER_CXA_ATEXIT) -#define PLUGIN_DYNAMIC_EXTRA_DECL uint32 __dso_handle __attribute__((visibility ("hidden"))) = 0 +#if defined(USE_ELF_LOADER) && defined(ELF_LOADER_CXA_ATEXIT) +#define PLUGIN_DYNAMIC_DSO_HANDLE \ + uint32 __dso_handle __attribute__((visibility("hidden"))) = 0; #else -#define PLUGIN_DYNAMIC_EXTRA_DECL void dummyFuncToAllowTrailingSemicolon() +#define PLUGIN_DYNAMIC_DSO_HANDLE #endif /** @@ -126,7 +127,7 @@ extern int pluginTypeVersions[PLUGIN_TYPE_MAX]; */ #define REGISTER_PLUGIN_DYNAMIC(ID,TYPE,PLUGINCLASS) \ extern "C" { \ - PLUGIN_DYNAMIC_EXTRA_DECL; \ + PLUGIN_DYNAMIC_DSO_HANDLE \ PLUGIN_EXPORT int32 PLUGIN_getVersion() { return PLUGIN_VERSION; } \ PLUGIN_EXPORT int32 PLUGIN_getType() { return TYPE; } \ PLUGIN_EXPORT int32 PLUGIN_getTypeVersion() { return TYPE##_VERSION; } \ |