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-20 00:41:48 +0000 |
| commit | e076dca074a581480046b37485ea3f5f8184c247 (patch) | |
| tree | cecfcbb6a511abadcf8a9607dd25d802b850f21b /sal | |
| parent | 505b83487ff82e400d1467a3ee0c6112506d7a3f (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>
(cherry picked from commit 909d87cc6187ecffa2704e67ffbe372fd2d90e49)
Reviewed-on: https://gerrit.libreoffice.org/26489
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/w32/salinit.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/sal/osl/w32/salinit.cxx b/sal/osl/w32/salinit.cxx index 04fab2700fc8..a03f8ae93c35 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""); |