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 /include/systools/win32 | |
| 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 'include/systools/win32')
| -rw-r--r-- | include/systools/win32/comptr.hxx | 4 | ||||
| -rw-r--r-- | include/systools/win32/snprintf.h | 5 | ||||
| -rw-r--r-- | include/systools/win32/uwinapi.h | 7 |
3 files changed, 0 insertions, 16 deletions
diff --git a/include/systools/win32/comptr.hxx b/include/systools/win32/comptr.hxx index db027274bc63..2a56ec92422a 100644 --- a/include/systools/win32/comptr.hxx +++ b/include/systools/win32/comptr.hxx @@ -174,15 +174,11 @@ class ComPtr } } -#ifndef __MINGW32__ - template< class T_QUERYINTERFACE > HRESULT query(T_QUERYINTERFACE** pQuery) { return m_pInterface->QueryInterface(__uuidof(T_QUERYINTERFACE), (void**)pQuery); } -#endif - HRESULT query(REFIID rIID , void** pQuery) diff --git a/include/systools/win32/snprintf.h b/include/systools/win32/snprintf.h index 4342add2f76d..94799d085e20 100644 --- a/include/systools/win32/snprintf.h +++ b/include/systools/win32/snprintf.h @@ -66,9 +66,6 @@ extern "C" { even if the buffer wasn't large enough to hold the string. */ - -#if !defined(__MINGW32__) || defined (__NO_ISOCEXT) - /* VS 2015 and above support ISO C snprintf */ #if _MSC_VER < 1900 @@ -80,8 +77,6 @@ LO_SNPRINTF_DLLIMPORT int __cdecl snprintf( char *buffer, size_t count, const ch #endif -#endif - /* Conflict with STL_port inline implementation */ #ifdef __cplusplus diff --git a/include/systools/win32/uwinapi.h b/include/systools/win32/uwinapi.h index cf89806f87fb..b441f3af6200 100644 --- a/include/systools/win32/uwinapi.h +++ b/include/systools/win32/uwinapi.h @@ -30,13 +30,6 @@ #include "prewin.h" #include "postwin.h" -#ifdef __MINGW32__ -#include <basetyps.h> -#ifdef _UWINAPI_ -#define WINBASEAPI -#endif -#endif - #ifdef __cplusplus inline bool IsValidHandle(HANDLE handle) |