From f76584d9b724c131914b62dd9caff17abf326a95 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Mon, 12 Aug 2013 12:45:24 +0200 Subject: Fix build on QNX There is std::isnan and friends, but math.h also defines isnan as macro, so std::isnan expands to std::whateverthemacrois and that fails to build. So include math.h early on, get rid of the macros and then we can continue to use std::isnan throughout the code base safely. Change-Id: Ifee580fa2adff396eb6d6f064d4c095a896fb022 Reviewed-by: Erik Verbruggen Reviewed-by: Fabian Bumberger --- src/qml/jsruntime/qv4global_p.h | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/qml/jsruntime/qv4global_p.h') diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 34ce6aefde..c5a31eb555 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -59,6 +59,14 @@ inline bool signbit(double d) { return _copysign(1.0, d) < 0; } inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } #endif +#if defined(Q_OS_QNX) +#include +#undef isnan +#undef isfinite +#undef isinf +#undef signbit +#endif + QT_BEGIN_NAMESPACE namespace QV4 { -- cgit v1.2.3