mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Uniquify uno_initEnvironment and uno_ext_getMapping in the static linking case

Browse Source
This commit is contained in:
Tor Lillqvist
2012-03-19 18:28:42 +02:00
parent c3f36b0e47
commit c0ab229dc7
5 changed files with 36 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cppu/source/AffineBridge/AffineBridge.cxx
View File

@@ -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()
{

7
cppu/source/LogBridge/LogBridge.cxx
View File

@@ -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()
{