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 /bridges | |
| parent | c3f36b0e4738f44375359789d450a28e7664d529 (diff) | |
Uniquify uno_initEnvironment and uno_ext_getMapping in the static linking case
Diffstat (limited to 'bridges')
| -rw-r--r-- | bridges/source/cpp_uno/shared/component.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/bridges/source/cpp_uno/shared/component.cxx b/bridges/source/cpp_uno/shared/component.cxx index 6f6bf255a1ac..3904a1d61e8a 100644 --- a/bridges/source/cpp_uno/shared/component.cxx +++ b/bridges/source/cpp_uno/shared/component.cxx @@ -196,7 +196,7 @@ static void SAL_CALL environmentDisposing( &bridges::cpp_uno::shared::g_moduleCount.modCnt ); } -#ifndef IOS +#ifndef DISABLE_DYNLOADING SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SAL_THROW_EXTERN_C() { return bridges::cpp_uno::shared::g_moduleCount.canUnload( @@ -205,8 +205,8 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_canUnload(TimeValue * pTime) SA #endif -#ifdef IOS -#define uno_initEnvironment gcc3_uno_initEnvironment +#ifdef DISABLE_DYNLOADING +#define uno_initEnvironment CPPU_ENV_uno_initEnvironment #endif void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv) @@ -227,6 +227,10 @@ void SAL_CALL uno_initEnvironment(uno_Environment * pCppEnv) pCppEnv->environmentDisposing = environmentDisposing; } +#ifdef DISABLE_DYNLOADING +#define uno_ext_getMapping CPPU_ENV_uno_ext_getMapping +#endif + void SAL_CALL uno_ext_getMapping( uno_Mapping ** ppMapping, uno_Environment * pFrom, uno_Environment * pTo) SAL_THROW_EXTERN_C() |