diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-03-19 18:28:42 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-03-21 00:00:04 +0200 |
| commit | c0ab229dc74e116760866f27b5df12e76430aef5 (patch) | |
| tree | dbb5ec2e9faa08338d7ca4cc5a87d84bca5f36ea /cppu/source | |
| parent | c3f36b0e4738f44375359789d450a28e7664d529 (diff) | |
Uniquify uno_initEnvironment and uno_ext_getMapping in the static linking case
Diffstat (limited to 'cppu/source')
| -rw-r--r-- | cppu/source/AffineBridge/AffineBridge.cxx | 7 | ||||
| -rw-r--r-- | cppu/source/LogBridge/LogBridge.cxx | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/cppu/source/AffineBridge/AffineBridge.cxx b/cppu/source/AffineBridge/AffineBridge.cxx index e5be92b4b8dc..b09fcacba4e3 100644 --- a/cppu/source/AffineBridge/AffineBridge.cxx +++ b/cppu/source/AffineBridge/AffineBridge.cxx @@ -348,6 +348,13 @@ int AffineBridge::v_isValid(rtl::OUString * pReason) return result; } +#ifdef DISABLE_DYNLOADING + +#define uno_initEnvironment affine_uno_uno_initEnvironment +#define uno_ext_getMapping affine_uno_uno_ext_getMapping + +#endif + extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { diff --git a/cppu/source/LogBridge/LogBridge.cxx b/cppu/source/LogBridge/LogBridge.cxx index 0451f9484579..877d8e52ae0c 100644 --- a/cppu/source/LogBridge/LogBridge.cxx +++ b/cppu/source/LogBridge/LogBridge.cxx @@ -262,6 +262,13 @@ void LogProbe( } } +#ifdef DISABLE_DYNLOADING + +#define uno_initEnvironment log_uno_uno_initEnvironment +#define uno_ext_getMapping log_uno_uno_ext_getMapping + +#endif + extern "C" void SAL_DLLPUBLIC_EXPORT SAL_CALL uno_initEnvironment(uno_Environment * pEnv) SAL_THROW_EXTERN_C() { |