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 /connectivity | |
| 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 'connectivity')
| -rw-r--r-- | connectivity/Library_postgresql-sdbc-impl.mk | 2 | ||||
| -rw-r--r-- | connectivity/source/drivers/ado/AKeys.cxx | 4 | ||||
| -rw-r--r-- | connectivity/source/inc/ado/Aolevariant.hxx | 3 |
3 files changed, 1 insertions, 8 deletions
diff --git a/connectivity/Library_postgresql-sdbc-impl.mk b/connectivity/Library_postgresql-sdbc-impl.mk index 0580a8b4106d..930eaf4d0e09 100644 --- a/connectivity/Library_postgresql-sdbc-impl.mk +++ b/connectivity/Library_postgresql-sdbc-impl.mk @@ -55,7 +55,7 @@ $(eval $(call gb_Library_use_externals,postgresql-sdbc-impl,\ )) ifeq ($(SYSTEM_POSTGRESQL),) -ifneq ($(OS)$(COM),WNTMSC) +ifneq ($(OS),WNT) $(eval $(call gb_Library_add_libs,postgresql-sdbc-impl,\ $(if $(WITH_GSSAPI),$(GSSAPI_LIBS)) \ diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 4a48330d7f57..150933368f87 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -30,10 +30,6 @@ #include <connectivity/dbexception.hxx> #include "resource/ado_res.hrc" -#if defined __MINGW32__ -#pragma GCC diagnostic warning "-Wwrite-strings" -#endif - using namespace ::comphelper; using namespace connectivity; using namespace connectivity::ado; diff --git a/connectivity/source/inc/ado/Aolevariant.hxx b/connectivity/source/inc/ado/Aolevariant.hxx index 320ef9706f54..f531848aa9b9 100644 --- a/connectivity/source/inc/ado/Aolevariant.hxx +++ b/connectivity/source/inc/ado/Aolevariant.hxx @@ -20,9 +20,6 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AOLEVARIANT_HXX #include <sal/types.h> -#ifdef __MINGW32__ -#include <windows.h> -#endif #include <rtl/ustring.hxx> #include <com/sun/star/uno/Sequence.hxx> |