diff options
| author | James McDonnell <jmcdonnell@qnx.com> | 2016-06-14 11:56:44 -0400 |
|---|---|---|
| committer | James McDonnell <jmcdonnell@qnx.com> | 2016-06-14 18:09:39 +0000 |
| commit | 5d22723e052480ff3893a21f6bd75142f9f4f6ea (patch) | |
| tree | 7faf70c59714219e80907accb3d55aa3849a4b3d /src | |
| parent | 7f8dc9d00c02e0e28cdea92cac8f8e4379bed68b (diff) | |
Make some QNX only code Dinkum specific
The undefines won't be needed for QNX 7.0 with GNU libc++.
Change-Id: Ibcea09aad54a956fc056ceaac5db6a0d53cd176c
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/masm/wtf/MathExtras.h | 2 | ||||
| -rw-r--r-- | src/qml/jsruntime/qv4global_p.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/masm/wtf/MathExtras.h b/src/3rdparty/masm/wtf/MathExtras.h index 28a189b6e6..9c38af6b16 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -43,7 +43,7 @@ #include <machine/ieee.h> #endif -#if OS(QNX) +#if OS(QNX) && defined(_CPPLIB_VER) // FIXME: Look into a way to have cmath import its functions into both the standard and global // namespace. For now, we include math.h since the QNX cmath header only imports its functions // into the standard namespace. diff --git a/src/qml/jsruntime/qv4global_p.h b/src/qml/jsruntime/qv4global_p.h index 01a21ea06d..960741d95f 100644 --- a/src/qml/jsruntime/qv4global_p.h +++ b/src/qml/jsruntime/qv4global_p.h @@ -122,7 +122,7 @@ inline double trunc(double d) { return d > 0 ? floor(d) : ceil(d); } #define ENABLE_JIT 0 #endif -#if defined(Q_OS_QNX) +#if defined(Q_OS_QNX) && defined(_CPPLIB_VER) #include <math.h> #undef isnan #undef isfinite |