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 /embedserv/source | |
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 'embedserv/source')
-rw-r--r-- | embedserv/source/embed/esdll.cxx | 4 | ||||
-rw-r--r-- | embedserv/source/embed/register.cxx | 3 | ||||
-rw-r--r-- | embedserv/source/inc/embeddocaccess.hxx | 2 | ||||
-rw-r--r-- | embedserv/source/inc/embservconst.h | 17 | ||||
-rw-r--r-- | embedserv/source/inc/stdafx.h | 5 | ||||
-rw-r--r-- | embedserv/source/inprocserv/dllentry.cxx | 16 |
6 files changed, 5 insertions, 42 deletions
diff --git a/embedserv/source/embed/esdll.cxx b/embedserv/source/embed/esdll.cxx index d998f0134297..ccf737053bba 100644 --- a/embedserv/source/embed/esdll.cxx +++ b/embedserv/source/embed/esdll.cxx @@ -22,10 +22,6 @@ #pragma warning(disable : 4917 4555) #endif -#ifdef __MINGW32__ -#define _INIT_ATL_COMMON_VARS -#endif - #include "stdafx.h" #include <atlbase.h> diff --git a/embedserv/source/embed/register.cxx b/embedserv/source/embed/register.cxx index bbe5f6b7f321..2890a07b3744 100644 --- a/embedserv/source/embed/register.cxx +++ b/embedserv/source/embed/register.cxx @@ -20,9 +20,6 @@ #pragma warning(disable : 4917 4555) #endif -#ifdef __MINGW32__ -#define INITGUID -#endif #include "servprov.hxx" #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/embedserv/source/inc/embeddocaccess.hxx b/embedserv/source/inc/embeddocaccess.hxx index 4ddefca1dab4..96d005863eaf 100644 --- a/embedserv/source/inc/embeddocaccess.hxx +++ b/embedserv/source/inc/embeddocaccess.hxx @@ -28,7 +28,6 @@ #define OLESERV_DEACTIVATE 6 #include <oleidl.h> -#ifndef __MINGW32__ #pragma warning(disable : 4265) #if defined __clang__ #pragma clang diagnostic push @@ -41,7 +40,6 @@ #if defined __clang__ #pragma clang diagnostic pop #endif -#endif #include <cppuhelper/weak.hxx> class EmbedDocument_Impl; diff --git a/embedserv/source/inc/embservconst.h b/embedserv/source/inc/embservconst.h index 332c0abe855f..aca7c8e49728 100644 --- a/embedserv/source/inc/embservconst.h +++ b/embedserv/source/inc/embservconst.h @@ -26,22 +26,6 @@ #define SUPPORTED_FACTORIES_NUM 10 -#if defined(__MINGW32__) && !defined(INITGUID) -extern "C" const GUID DECLSPEC_SELECTANY OID_WriterTextServer; -extern "C" const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer; - -extern "C" const GUID DECLSPEC_SELECTANY OID_CalcServer; -extern "C" const GUID DECLSPEC_SELECTANY OID_CalcOASISServer; - -extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingServer; -extern "C" const GUID DECLSPEC_SELECTANY OID_DrawingOASISServer; - -extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationServer; -extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer; - -extern "C" const GUID DECLSPEC_SELECTANY OID_MathServer; -extern "C" const GUID DECLSPEC_SELECTANY OID_MathOASISServer; -#else extern "C" const GUID DECLSPEC_SELECTANY OID_WriterTextServer = { SO3_SW_OLE_EMBED_CLASSID_60 }; extern "C" const GUID DECLSPEC_SELECTANY OID_WriterOASISTextServer = { SO3_SW_OLE_EMBED_CLASSID_8 }; @@ -56,7 +40,6 @@ extern "C" const GUID DECLSPEC_SELECTANY OID_PresentationOASISServer = { SO3_SIM extern "C" const GUID DECLSPEC_SELECTANY OID_MathServer = { SO3_SM_OLE_EMBED_CLASSID_60 }; extern "C" const GUID DECLSPEC_SELECTANY OID_MathOASISServer = { SO3_SM_OLE_EMBED_CLASSID_8 }; -#endif #endif diff --git a/embedserv/source/inc/stdafx.h b/embedserv/source/inc/stdafx.h index 06b6606706f6..c056c5bf714a 100644 --- a/embedserv/source/inc/stdafx.h +++ b/embedserv/source/inc/stdafx.h @@ -38,11 +38,6 @@ //You may derive a class from CComModule and use it if you want to override //something, but do not change the name of _Module extern CComModule _Module; -#ifdef __MINGW32__ -#include <algorithm> -using ::std::min; -using ::std::max; -#endif #include <atlcom.h> #include <atlctl.h> diff --git a/embedserv/source/inprocserv/dllentry.cxx b/embedserv/source/inprocserv/dllentry.cxx index 58bc9a3a5c32..a4346eab84c2 100644 --- a/embedserv/source/inprocserv/dllentry.cxx +++ b/embedserv/source/inprocserv/dllentry.cxx @@ -21,12 +21,6 @@ #include <stdio.h> #include <inprocembobj.h> -#ifdef __MINGW32__ -#define INITGUID -#define INPROC_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -#else -#define INPROC_DLLPUBLIC -#endif #include <embservconst.h> static const GUID* guidList[ SUPPORTED_FACTORIES_NUM ] = { @@ -163,7 +157,7 @@ protected: // Entry points -extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ ) +extern "C" BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwReason, LPVOID /*lpReserved*/ ) { if (dwReason == DLL_PROCESS_ATTACH) { @@ -177,7 +171,7 @@ extern "C" INPROC_DLLPUBLIC BOOL WINAPI DllMain( HINSTANCE hInstance, DWORD dwRe } -STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) +STDAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { for( int nInd = 0; nInd < SUPPORTED_FACTORIES_NUM; nInd++ ) if ( *guidList[nInd] == rclsid ) @@ -194,7 +188,7 @@ STDAPI INPROC_DLLPUBLIC DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* } -STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() +STDAPI DllCanUnloadNow() { if ( !g_nObj && !g_nLock ) return S_OK; @@ -203,7 +197,7 @@ STDAPI INPROC_DLLPUBLIC DllCanUnloadNow() } -STDAPI INPROC_DLLPUBLIC DllRegisterServer() +STDAPI DllRegisterServer() { HMODULE aCurModule = GetModuleHandleA( "inprocserv.dll" ); if( aCurModule ) @@ -221,7 +215,7 @@ STDAPI INPROC_DLLPUBLIC DllRegisterServer() } -STDAPI INPROC_DLLPUBLIC DllUnregisterServer() +STDAPI DllUnregisterServer() { return WriteLibraryToRegistry( "ole32.dll", 10 ); } |