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/cppuhelper/implementationentry.hxx | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'include/cppuhelper') diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx index e7bb34b838a6..36bf15af138d 100644 --- a/include/cppuhelper/implementationentry.hxx +++ b/include/cppuhelper/implementationentry.hxx @@ -22,16 +22,6 @@ #include #include -// MinGW wants it the one way around while MSVC wants it the other (cf. -// "Syntactic __cdecl -// incompatibility with MSVC"; and everywhere else, SAL_CALL is empty, so -// doesn't matter): -#if defined __GNUC__ -#define MY_FN_PTR(name) SAL_CALL (* name) -#else -#define MY_FN_PTR(name) (SAL_CALL * name) -#endif - namespace cppu { /** One struct instance represents all data necessary for registering one service implementation. @@ -46,12 +36,12 @@ struct SAL_WARN_UNUSED ImplementationEntry /** Function that returns the implementation-name of the implementation (same as XServiceInfo.getImplementationName() ). */ - rtl::OUString MY_FN_PTR( getImplementationName )(); + rtl::OUString (SAL_CALL * getImplementationName)(); /** Function that returns all supported servicenames of the implementation ( same as XServiceInfo.getSupportedServiceNames() ). */ - css::uno::Sequence< rtl::OUString > MY_FN_PTR( getSupportedServiceNames ) (); + css::uno::Sequence< rtl::OUString > (SAL_CALL * getSupportedServiceNames) (); /** Function that creates a SingleComponentFactory. @@ -59,7 +49,7 @@ struct SAL_WARN_UNUSED ImplementationEntry removed library unloading feature; always set to null. */ css::uno::Reference< css::lang::XSingleComponentFactory > - MY_FN_PTR( createFactory )( + (SAL_CALL * createFactory)( ComponentFactoryFunc fptr, ::rtl::OUString const & rImplementationName, css::uno::Sequence< ::rtl::OUString > const & rServiceNames, -- cgit