[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/source
I-Jui Sung (Ray)
ray at multicorewareinc.com
Wed Nov 27 16:38:05 PST 2013
sc/source/core/opencl/formulagroupcl.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit d82c9a499e2b6e4e57a7907ae2679a1fe7720458
Author: I-Jui (Ray) Sung <ray at multicorewareinc.com>
Date: Wed Nov 27 18:36:47 2013 -0600
GPU Calc: fix compilation failure on Windows due to missing NAN macro
Change-Id: I0d53dcf147a06f831120c5489b2975e42ea6120b
diff --git a/sc/source/core/opencl/formulagroupcl.cxx b/sc/source/core/opencl/formulagroupcl.cxx
index 7d62ffe..8ccb967 100644
--- a/sc/source/core/opencl/formulagroupcl.cxx
+++ b/sc/source/core/opencl/formulagroupcl.cxx
@@ -31,6 +31,14 @@
#define REDUCE_THRESHOLD 4 // set to 4 for correctness testing. priority 1
#define UNROLLING_FACTOR 16 // set to 4 for correctness testing (if no reduce)
#include "formulagroupcl_public.hxx"
+#ifdef WIN32
+#ifndef NAN
+namespace {
+static const unsigned long __nan[2] = {0xffffffff, 0x7fffffff};
+}
+#define NAN (*(const float *) __nan)
+#endif
+#endif
#include <list>
#include <map>
More information about the Libreoffice-commits
mailing list