[Libreoffice-commits] core.git: sc/source

[Tor Lillqvist]

 sc/source/core/tool/formulagroup.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f1b2c5185762debdd4ccbdb369472f5d30950e75
Author: Tor Lillqvist <tml at collabora.com>
Date:   Fri Sep 20 14:13:58 2013 +0300

    extern "C" it should be
    
    Change-Id: If44baa59b524f2fdf9bca77e404142a569090d72

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 3179480..b1808e0 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -402,8 +402,8 @@ void FormulaGroupInterpreter::fillOpenCLInfo(std::vector<OpenclPlatformInfo>& rP
     reinterpret_cast<__fillOpenCLInfo>(fn)(&aPlatforms[0], aPlatforms.size());
     rPlatforms.swap(aPlatforms);
 #else
-    extern size_t getOpenCLPlatformCount(void);
-    extern void fillOpenCLInfo(OpenclPlatformInfo*, size_t);
+    extern "C" size_t getOpenCLPlatformCount(void);
+    extern "C" void fillOpenCLInfo(OpenclPlatformInfo*, size_t);
 
     size_t nPlatforms = getOpenCLPlatformCount();
     if (!nPlatforms)
@@ -445,7 +445,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool
     if(!bSuccess)
         return;
 #else
-    extern bool switchOpenClDevice(const OUString*, bool);
+    extern "C" bool switchOpenClDevice(const OUString*, bool);
 
     bool bSuccess = switchOpenClDevice(&rDeviceId, bAutoSelect);
     if(!bSuccess)
@@ -460,7 +460,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool
     if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
     {
 #ifdef DISABLE_DYNLOADING
-        extern sc::FormulaGroupInterpreter* createFormulaGroupOpenCLInterpreter();
+        extern "C" sc::FormulaGroupInterpreter* createFormulaGroupOpenCLInterpreter();
         msInstance = createFormulaGroupOpenCLInterpreter();
 #else
         // Dynamically load scopencl shared object, and instantiate the opencl interpreter.
@@ -493,7 +493,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels()
 
     reinterpret_cast<__compileOpenCLKernels>(fn)(&rConfig.maOpenCLDevice);
 #else
-    extern void compileOpenCLKernels(const OUString*);
+    extern "C" void compileOpenCLKernels(const OUString*);
 
     compileOpenCLKernels(&rConfig.maOpenCLDevice);
 #endif