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 --- include/sal/config.h | 3 --- include/sal/types.h | 21 +++------------------ 2 files changed, 3 insertions(+), 21 deletions(-) (limited to 'include/sal') diff --git a/include/sal/config.h b/include/sal/config.h index a363b1922533..24612f70ec18 100644 --- a/include/sal/config.h +++ b/include/sal/config.h @@ -44,9 +44,6 @@ #endif /* defined _MSC_VER */ /* Provide ISO C99 compatible versions of snprint and vsnprintf */ -#ifdef __MINGW32__ -#define LO_SNPRINTF_DLLIMPORT -#endif #ifndef _SNPRINTF_H #include #endif diff --git a/include/sal/types.h b/include/sal/types.h index 0aee64874fb6..a2e7b121b7c6 100644 --- a/include/sal/types.h +++ b/include/sal/types.h @@ -31,15 +31,6 @@ extern "C" { #endif -#if defined ( __MINGW32__ ) && !defined ( __USE_MINGW_ANSI_STDIO ) -/* Define to use the C99 formatting string for coherence reasons. - * In mingw-w64 some functions are ported to the ms formatting string - * some are not yet. This is the only way to make the formatting - * strings work all the time - */ -#define __USE_MINGW_ANSI_STDIO 1 -#endif - /********************************************************************************/ /* Data types */ @@ -141,11 +132,9 @@ typedef signed char sal_sChar; */ typedef unsigned char sal_uChar; -#if ( defined(SAL_W32) && !defined(__MINGW32__) ) +#if defined(SAL_W32) // http://msdn.microsoft.com/en-us/library/s3f49ktz%28v=vs.80%29.aspx // "By default wchar_t is a typedef for unsigned short." - // But MinGW has a native wchar_t, and on many places, we cannot deal with - // that, so sal_Unicode has to be explicitly typedef'd as sal_uInt16 there. typedef wchar_t sal_Unicode; #else #define SAL_UNICODE_NOTEQUAL_WCHAR_T @@ -241,14 +230,10 @@ typedef void * sal_Handle; #define SAL_MAX_ENUM 0x7fffffff -#if defined(_MSC_VER) || defined(__MINGW32__) +#if defined(_MSC_VER) # define SAL_DLLPUBLIC_EXPORT __declspec(dllexport) # define SAL_JNI_EXPORT __declspec(dllexport) -#if defined(_MSC_VER) # define SAL_DLLPUBLIC_IMPORT __declspec(dllimport) -#else -# define SAL_DLLPUBLIC_IMPORT -#endif // defined(_MSC_VER) # define SAL_DLLPRIVATE # define SAL_DLLPUBLIC_TEMPLATE # define SAL_DLLPUBLIC_RTTI @@ -299,7 +284,7 @@ typedef void * sal_Handle; These macros are used for inline declarations of exception classes, as in rtl/malformeduriexception.hxx. */ -#if defined(__GNUC__) && ! defined(__MINGW32__) +#if defined(__GNUC__) # if defined(DISABLE_DYNLOADING) # define SAL_EXCEPTION_DLLPUBLIC_EXPORT __attribute__((visibility("default"))) # else -- cgit