[Libreoffice-commits] core.git: 2 commits - configure.ac sc/Module_sc.mk sc/source

[Tor Lillqvist]

 configure.ac                         |    1 -
 sc/Module_sc.mk                      |    2 +-
 sc/source/core/tool/formulagroup.cxx |   10 ++++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

New commits:
commit ff3b823ef4b867263711703fab596584314e4f58
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 9 16:54:11 2013 +0300

    Fix for !HAVE_FEATURE_OPENCL
    
    Change-Id: I98cc2819e5de88cdce235735518b64193610fdc6

diff --git a/sc/source/core/tool/formulagroup.cxx b/sc/source/core/tool/formulagroup.cxx
index 21edd7e..96ae83e 100644
--- a/sc/source/core/tool/formulagroup.cxx
+++ b/sc/source/core/tool/formulagroup.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_features.h>
+
 #include "formulagroup.hxx"
 #include "document.hxx"
 #include "formulacell.hxx"
@@ -17,7 +19,6 @@
 
 #include "formula/vectortoken.hxx"
 #include "rtl/bootstrap.hxx"
-#include "config_features.h"
 
 #include <vector>
 #include <boost/unordered_map.hpp>
@@ -422,6 +423,7 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool
         msInstance = new sc::FormulaGroupInterpreterSoftware();
         return;
     }
+#if HAVE_FEATURE_OPENCL
 #ifndef DISABLE_DYNLOADING
     osl::Module* pModule = getOpenCLModule();
     if (!pModule)
@@ -439,12 +441,14 @@ void FormulaGroupInterpreter::switchOpenCLDevice(const OUString& rDeviceId, bool
     if(!bSuccess)
         return;
 #endif
+#else
+    (void) bAutoSelect;
+#endif
 
     delete msInstance;
     msInstance = NULL;
 
 #if HAVE_FEATURE_OPENCL
-
     if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
     {
 #ifdef DISABLE_DYNLOADING
@@ -469,6 +473,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels()
         // OpenCL is not enabled.
         return;
 
+#if HAVE_FEATURE_OPENCL
 #ifndef DISABLE_DYNLOADING
     osl::Module* pModule = getOpenCLModule();
     if (!pModule)
@@ -482,6 +487,7 @@ void FormulaGroupInterpreter::compileOpenCLKernels()
 #else
     ::compileOpenCLKernels(&rConfig.maOpenCLDevice);
 #endif
+#endif
 }
 
 void FormulaGroupInterpreter::generateRPNCode(ScDocument& rDoc, const ScAddress& rPos, ScTokenArray& rCode)
commit d9c5452a15510b81edc59605ca234b8f61d478e7
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Oct 9 16:33:59 2013 +0300

    ENABLE_OPENCL should be TRUE or empty
    
    Should make the Android tinderboxes happy.
    
    Change-Id: Idf33106514a1d0e34566d76d97d689e7543eda3c

diff --git a/configure.ac b/configure.ac
index c936949..f6c0c01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10330,7 +10330,6 @@ if test $_os != iOS -a $_os != Android -a "x$enable_opencl" != "xno"; then
 else
     AC_MSG_RESULT([no])
     enable_opencl=no
-    ENABLE_OPENCL=FALSE
 fi
 
 AC_SUBST(ENABLE_OPENCL)
diff --git a/sc/Module_sc.mk b/sc/Module_sc.mk
index 6522862..0fae42d 100644
--- a/sc/Module_sc.mk
+++ b/sc/Module_sc.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_Module_add_targets,sc,\
 	UIConfig_scalc \
 ))
 
-ifeq ($(ENABLE_OPENCL),TRUE)
+ifneq (,$(ENABLE_OPENCL))
 $(eval $(call gb_Module_add_targets,sc,\
 	Library_scopencl \
 ))