Revert "These should be ifdef, per compiler warnings."

This reverts commit fcf4a2ea.

sc/source/core/tool/formulagroup.cxx

@@ -111,7 +111,7 @@ FormulaGroupInterpreter *FormulaGroupInterpreter::getStatic()
 
     if ( !msInstance )
     {
-#ifdef HAVE_FEATURE_OPENCL
+#if HAVE_FEATURE_OPENCL
         if ( ScInterpreter::GetGlobalConfig().mbOpenCLEnabled )
             msInstance = sc::opencl::createFormulaGroupInterpreter();
 #endif

sc/source/ui/optdlg/calcoptionsdlg.cxx

@@ -199,7 +199,7 @@ void ScCalcOptionsDialog::FillOptionsList()
     }
 
     pModel->Insert(createBoolItem(maCaptionEmptyStringAsZero,maConfig.mbEmptyStringAsZero));
-#ifdef HAVE_FEATURE_OPENCL
+#if HAVE_FEATURE_OPENCL
     pModel->Insert(createBoolItem(maCaptionOpenCLEnabled,maConfig.mbOpenCLEnabled));
 #endif