[Libreoffice-commits] core.git: vcl/headless vcl/inc

[Tor Lillqvist]

 vcl/headless/svpdata.cxx     |   11 ++++-------
 vcl/inc/headless/svpinst.hxx |    2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit ff0c2916f002b630685c8a6fbae8494c7b01c6dd
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Mar 20 18:36:02 2015 +0200

    No need for svp_create_SalInstance to be extern "C"
    
    Change-Id: I29eb3dfee751c5f40690f604eaff9bd1f18cf046

diff --git a/vcl/headless/svpdata.cxx b/vcl/headless/svpdata.cxx
index f5b25a1..56e7b8d 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 d68d22b..44795d5 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
 {