diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-27 14:41:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-28 20:53:40 +0200 |
| commit | a3ce60eb3c8bb5c69ab41556398efa8316286477 (patch) | |
| tree | a9600fdf96ab53a1aef150fd9c4a1e8c23b9eb90 /cli_ure | |
| parent | abfe16cec61eae33c64cb1901f0fc740b0466f60 (diff) | |
We only support MSVC 2008 (_MSC_VER 1500) or later
We can drop or simplify many conditionals.
Change-Id: I37e820e515cc09845c30b62c89ddb3b6ff370f97
Diffstat (limited to 'cli_ure')
| -rw-r--r-- | cli_ure/source/uno_bridge/cli_bridge.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/cli_ure/source/uno_bridge/cli_bridge.cxx b/cli_ure/source/uno_bridge/cli_bridge.cxx index 6da6cdf25aad..4d6a4e3a2ddb 100644 --- a/cli_ure/source/uno_bridge/cli_bridge.cxx +++ b/cli_ure/source/uno_bridge/cli_bridge.cxx @@ -31,9 +31,6 @@ #include "cli_bridge.h" #include "cli_proxy.h" -#if defined(_MSC_VER) && (_MSC_VER < 1400) -#include <_vcclrit.h> -#endif namespace sri= System::Runtime::InteropServices; using ::rtl::OUString; @@ -268,9 +265,10 @@ SAL_DLLPUBLIC_EXPORT void SAL_CALL uno_initEnvironment( uno_Environment * uno_cl SAL_THROW_EXTERN_C() { //ToDo: remove when compiled with .NET 2 -#if defined(_MSC_VER) && (_MSC_VER < 1400) - __crt_dll_initialize(); -#endif + + // Unclear whether the above comment refers to this whole function + // or a call to __crt_dll_initialize() that used to be here for + // _MSC_VER < 1400 uno_cli_env->environmentDisposing= cli_env_disposing; uno_cli_env->pExtEnv = 0; |