diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-08 15:58:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-11 12:13:46 +0100 |
| commit | 3af500580b1c82eabd60335c9ebc458a3f68850c (patch) | |
| tree | e0ad105be694cfb46221d16e9ce987879794fa04 /salhelper | |
| parent | 0f9a596aa853b4f2beeff25c131246a7b31492a4 (diff) | |
loplugin:salcall fix functions
since cdecl is the default calling convention on Windows for
such functions, the annotation is redundant.
Change-Id: I1a85fa27e5ac65ce0e04a19bde74c90800ffaa2d
Reviewed-on: https://gerrit.libreoffice.org/46164
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'salhelper')
| -rw-r--r-- | salhelper/source/dynload.cxx | 2 | ||||
| -rw-r--r-- | salhelper/test/Symbols/samplelib.hxx | 10 | ||||
| -rw-r--r-- | salhelper/test/dynamicloader/samplelib.hxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/salhelper/source/dynload.cxx b/salhelper/source/dynload.cxx index 7c9c9ce55612..b3a9e00322ae 100644 --- a/salhelper/source/dynload.cxx +++ b/salhelper/source/dynload.cxx @@ -23,7 +23,7 @@ namespace salhelper { -typedef void* (SAL_CALL *ApiInitFunction) (void); +typedef void* (*ApiInitFunction) (void); ORealDynamicLoader::ORealDynamicLoader(ORealDynamicLoader ** ppSetToZeroInDestructor_, const rtl::OUString& moduleName, diff --git a/salhelper/test/Symbols/samplelib.hxx b/salhelper/test/Symbols/samplelib.hxx index e2d956591bb5..d1213f6dea8b 100644 --- a/salhelper/test/Symbols/samplelib.hxx +++ b/salhelper/test/Symbols/samplelib.hxx @@ -24,18 +24,18 @@ struct SampleLib_Api { - sal_Int32 (SAL_CALL *funcA)( sal_Int32 ); - double (SAL_CALL *funcB)( double ); + sal_Int32 (*funcA)( sal_Int32 ); + double (*funcB)( double ); }; -typedef SampleLib_Api* (SAL_CALL *InitSampleLib_Api)(void); +typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" -sal_Int32 SAL_CALL funcA( sal_Int32 a); -double SAL_CALL funcB( double a); +sal_Int32 funcA( sal_Int32 a); +double funcB( double a); #endif diff --git a/salhelper/test/dynamicloader/samplelib.hxx b/salhelper/test/dynamicloader/samplelib.hxx index 06088646c1c4..7b65a0ceb182 100644 --- a/salhelper/test/dynamicloader/samplelib.hxx +++ b/salhelper/test/dynamicloader/samplelib.hxx @@ -24,12 +24,12 @@ struct SampleLib_Api { - sal_Int32 (SAL_CALL *funcA)( sal_Int32 ); - double (SAL_CALL *funcB)( double ); + sal_Int32 (*funcA)( sal_Int32 ); + double (*funcB)( double ); }; -typedef SampleLib_Api* (SAL_CALL *InitSampleLib_Api)(void); +typedef SampleLib_Api* (*InitSampleLib_Api)(void); #define SAMPLELIB_INIT_FUNCTION_NAME "initSampleLibApi" |