diff options
Diffstat (limited to 'include/cppuhelper/implementationentry.hxx')
| -rw-r--r-- | include/cppuhelper/implementationentry.hxx | 16 |
1 files changed, 3 insertions, 13 deletions
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 <cppuhelper/factory.hxx> #include <cppuhelper/cppuhelperdllapi.h> -// MinGW wants it the one way around while MSVC wants it the other (cf. -// <sourceforge.net/support/tracker.php?aid=3514133> "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, |