Kaydet (Commit) 909d87cc authored tarafından Markus Mohrhard's avatar Markus Mohrhard

move the code for tdf#99410 to the sal init windows code

Change-Id: I4ead30fa1736a3a99fb3379e89367934c8df2809
Reviewed-on: https://gerrit.libreoffice.org/26444Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst fabd384e
...@@ -107,12 +107,6 @@ static bool dumpCallback(const wchar_t* path, const wchar_t* id, ...@@ -107,12 +107,6 @@ static bool dumpCallback(const wchar_t* path, const wchar_t* id,
#endif #endif
extern "C" int DESKTOP_DLLPUBLIC soffice_main() 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 HAVE_FEATURE_BREAKPAD
#if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID #if defined( UNX ) && !defined MACOSX && !defined IOS && !defined ANDROID
......
...@@ -35,6 +35,12 @@ void sal_initGlobalTimer(); ...@@ -35,6 +35,12 @@ void sal_initGlobalTimer();
void sal_detail_initialize(int argc, char ** argv) 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(); sal_initGlobalTimer();
// SetProcessDEPPolicy(PROCESS_DEP_ENABLE); // SetProcessDEPPolicy(PROCESS_DEP_ENABLE);
// SetDllDirectoryW(L""); // SetDllDirectoryW(L"");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment