From 8646ab97dc37c0606b19057686bf3d610f9c15ee Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Fri, 10 Feb 2017 14:05:21 +0100 Subject: Remove MinGW support In OOo times, there'd originally been efforts to allow building on Windows with MinGW. Later, in LO times, this has been shifted to an attempt of cross- compiling for Windows on Linux. That attempt can be considered abandoned, and the relevant code rotting. Due to this heritage, there are now three kinds of MinGW-specific code in LO: * Code from the original OOo native Windows effort that is no longer relevant for the LO cross-compilation effort, but has never been removed properly. * Code from the original OOo native Windows effort that is re-purposed for the LO cross-compilation effort. * Code that has been added specifially for the LO cross-compilation effort. All three kinds of code are removed. (An unrelated, remaining use of MinGW is for --enable-build-unowinreg, utilizing --with-mingw-cross-compiler, MINGWCXX, and MINGWSTRIP.) Change-Id: I49daad8669b4cbe49fa923050c4a4a6ff7dda568 Reviewed-on: https://gerrit.libreoffice.org/34127 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- vcl/win/app/saltimer.cxx | 19 ------------------- 1 file changed, 19 deletions(-) (limited to 'vcl/win/app/saltimer.cxx') diff --git a/vcl/win/app/saltimer.cxx b/vcl/win/app/saltimer.cxx index 7930ac9e0b6c..8a21780e6d1e 100644 --- a/vcl/win/app/saltimer.cxx +++ b/vcl/win/app/saltimer.cxx @@ -22,10 +22,6 @@ #include #include -#if defined ( __MINGW32__ ) -#include -#endif - // maximum period #define MAX_SYSPERIOD 65533 @@ -119,17 +115,8 @@ at better resolution than 10ms. */ void CALLBACK SalTimerProc(PVOID, BOOLEAN) { -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) - jmp_buf jmpbuf; - __SEHandler han; - if (__builtin_setjmp(jmpbuf) == 0) - { - han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER); -#else __try { -#endif - SalData* pSalData = GetSalData(); // always post message when the timer fires, we will remove the ones @@ -140,16 +127,10 @@ void CALLBACK SalTimerProc(PVOID, BOOLEAN) if (0 == ret) // SEH prevents using SAL_WARN here? fputs("ERROR: PostMessage() failed!", stderr); #endif - -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) - } - han.Reset(); -#else } __except(WinSalInstance::WorkaroundExceptionHandlingInUSER32Lib(GetExceptionCode(), GetExceptionInformation())) { } -#endif } /** Called in the main thread. -- cgit v1.2.1