diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-17 21:26:34 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2016-06-18 14:23:54 +0000 |
| commit | 909d87cc6187ecffa2704e67ffbe372fd2d90e49 (patch) | |
| tree | ece43a6d04acad4d59f530dd77e109d2a850de19 | |
| parent | fabd384e1596d8a5d8753985cca9a4c14c49a1fc (diff) | |
move the code for tdf#99410 to the sal init windows code
Change-Id: I4ead30fa1736a3a99fb3379e89367934c8df2809
Reviewed-on: https://gerrit.libreoffice.org/26444
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: Jenkins <ci@libreoffice.org>
| -rw-r--r-- | desktop/source/app/sofficemain.cxx | 6 | ||||
| -rw-r--r-- | sal/osl/w32/salinit.cxx | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 146c5804f47b..755da5920e09 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -107,12 +107,6 @@ static bool dumpCallback(const wchar_t* path, const wchar_t* id, #endif extern "C" int DESKTOP_DLLPUBLIC soffice_main() { -#if defined(_WIN64) && _MSC_VER <= 1800 - // tdf#99410: MSVC 2013 runtime library has problems with some math functions if - // the CPU supports them and they are disabled in the OS - _set_FMA3_enable(0); -#endif - #if HAVE_FEATURE_BREAKPAD #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx index afa63dec1c92..84022f2dc76d 100644 --- a/sal/osl/w32/salinit.cxx +++ b/sal/osl/w32/salinit.cxx @@ -35,6 +35,12 @@ void sal_initGlobalTimer(); void sal_detail_initialize(int argc, char ** argv) { +#if defined(_WIN64) && _MSC_VER <= 1800 + // tdf#99410: MSVC 2013 runtime library has problems with some math functions if + // the CPU supports them and they are disabled in the OS + _set_FMA3_enable(0); +#endif + sal_initGlobalTimer(); // SetProcessDEPPolicy(PROCESS_DEP_ENABLE); // SetDllDirectoryW(L""); |