diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 14:05:21 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-02-10 18:01:27 +0000 |
| commit | 8646ab97dc37c0606b19057686bf3d610f9c15ee (patch) | |
| tree | 17b3df6f5cf55cb1091c4aa70930dd415d9ea0e3 /vcl/win/gdi | |
| parent | 09e9274fc080b471393b806617eb03124db67590 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'vcl/win/gdi')
| -rw-r--r-- | vcl/win/gdi/gdiimpl.cxx | 11 | ||||
| -rw-r--r-- | vcl/win/gdi/salprn.cxx | 20 |
2 files changed, 0 insertions, 31 deletions
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx index 250c2c84103e..277b1d85b94e 100644 --- a/vcl/win/gdi/gdiimpl.cxx +++ b/vcl/win/gdi/gdiimpl.cxx @@ -51,12 +51,6 @@ #include "prewin.h" -#ifdef __MINGW32__ -#ifdef GetObject -#undef GetObject -#endif -#endif - #include <gdiplus.h> #include <gdiplusenums.h> #include <gdipluscolor.h> @@ -2166,12 +2160,7 @@ void setInterpolationMode( if(bSameWidth && bSameHeight) { -#ifdef __MINGW32__ - //Gdiplus::InterpolationModeInvalid is missing on mingw - rGraphics.SetInterpolationMode(Gdiplus::InterpolationModeDefault); -#else rGraphics.SetInterpolationMode(Gdiplus::InterpolationModeInvalid); -#endif } else if(rDestWidth > rSrcWidth && rDestHeight > rSrcHeight) { diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index f2f25d654d35..63c0c24ba810 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -49,25 +49,6 @@ #include <malloc.h> -#if defined ( __MINGW32__ ) -#include <sehandler.hxx> -#endif - -#if defined ( __MINGW32__ ) && !defined ( _WIN64 ) -#define CATCH_DRIVER_EX_BEGIN \ - jmp_buf jmpbuf; \ - __SEHandler han; \ - if (__builtin_setjmp(jmpbuf) == 0) \ - { \ - han.Set(jmpbuf, NULL, (__SEHandler::PF)EXCEPTION_EXECUTE_HANDLER) - -#define CATCH_DRIVER_EX_END(mes, p) \ - } \ - han.Reset() -#define CATCH_DRIVER_EX_END_2(mes) \ - } \ - han.Reset() -#else #define CATCH_DRIVER_EX_BEGIN \ __try \ { @@ -84,7 +65,6 @@ { \ OSL_FAIL( mes ); \ } -#endif using namespace com::sun::star; using namespace com::sun::star::uno; |