diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-03-20 18:36:02 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-03-20 18:36:21 +0200 |
| commit | ff0c2916f002b630685c8a6fbae8494c7b01c6dd (patch) | |
| tree | f734a6161e438f6037b14d153223c4e3abbfe0d7 | |
| parent | The 'svp' "plug-in" library is empty so don't build it at all (diff) | |
| download | core-ff0c2916f002b630685c8a6fbae8494c7b01c6dd.tar.gz core-ff0c2916f002b630685c8a6fbae8494c7b01c6dd.zip | |
No need for svp_create_SalInstance to be extern "C"
Change-Id: I29eb3dfee751c5f40690f604eaff9bd1f18cf046
| -rw-r--r-- | vcl/headless/svpdata.cxx | 11 | ||||
| -rw-r--r-- | vcl/inc/headless/svpinst.hxx | 2 |
2 files changed, 5 insertions, 8 deletions
diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx index f5b25a1150f7..56e7b8d82db0 100644 --- a/vcl/headless/svpdata.cxx +++ b/vcl/headless/svpdata.cxx @@ -19,14 +19,11 @@ public: }; // plugin factory function -extern "C" +SalInstance* svp_create_SalInstance() { - SalInstance* svp_create_SalInstance() - { - SvpSalInstance* pInstance = new SvpSalInstance( new SalYieldMutex() ); - new SvpSalData( pInstance ); - return pInstance; - } + SvpSalInstance* pInstance = new SvpSalInstance( new SalYieldMutex() ); + new SvpSalData( pInstance ); + return pInstance; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/inc/headless/svpinst.hxx b/vcl/inc/headless/svpinst.hxx index d68d22b547c5..44795d56ab49 100644 --- a/vcl/inc/headless/svpinst.hxx +++ b/vcl/inc/headless/svpinst.hxx @@ -57,7 +57,7 @@ public: class SvpSalFrame; class GenPspGraphics; -extern "C" SalInstance* svp_create_SalInstance(); +SalInstance* svp_create_SalInstance(); class VCL_DLLPUBLIC SvpSalInstance : public SalGenericInstance { |