desktop/source/app/sofficemain.cxx | 6 ------ sal/osl/w32/salinit.cxx | 6 ++++++ 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit e076dca074a581480046b37485ea3f5f8184c247 Author: Markus Mohrhard <markus.mohrh...@googlemail.com> Date: Fri Jun 17 21:26:34 2016 +0200 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.mohrh...@googlemail.com> Tested-by: Jenkins <c...@libreoffice.org> (cherry picked from commit 909d87cc6187ecffa2704e67ffbe372fd2d90e49) Reviewed-on: https://gerrit.libreoffice.org/26489 diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 146c580..755da59 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 04fab27..a03f8ae 100644 --- a/sal/osl/w32/salinit.cxx +++ b/sal/osl/w32/salinit.cxx @@ -55,6 +55,12 @@ extern "C" void invalidParameterHandler( 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""); _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits