diff options
| author | Frank Osterfeld <osterfeld@kde.org> | 2014-01-22 12:14:51 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-24 16:30:24 +0100 |
| commit | bbd4f4195f6efd78c8668839b0756b5a46ce5b09 (patch) | |
| tree | 5d414c4390c609df5ba0815c75cf9cb7abe782b7 | |
| parent | 2407cd29e628671f7f5144e0d241d4249a3ab612 (diff) | |
Fix QNX 6.6 build
The stdlib of the upcoming QNX 6.6 has this abs overload,
so check for the version when redefining it.
Change-Id: Ib5650226c65417b42d8d7a79fac7ca53d3f315f1
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Bernd Weimer <bweimer@blackberry.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| -rw-r--r-- | src/3rdparty/masm/wtf/MathExtras.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/3rdparty/masm/wtf/MathExtras.h b/src/3rdparty/masm/wtf/MathExtras.h index 5b12157148..9a85291ae2 100644 --- a/src/3rdparty/masm/wtf/MathExtras.h +++ b/src/3rdparty/masm/wtf/MathExtras.h @@ -147,8 +147,8 @@ inline long lroundf(float num) { return static_cast<long>(roundf(num)); } #endif -#if COMPILER(GCC) && OS(QNX) -// The stdlib on QNX doesn't contain long abs(long). See PR #104666. +#if COMPILER(GCC) && OS(QNX) && _CPPLIB_VER < 640 +// The stdlib on QNX < 6.6 doesn't contain long abs(long). See PR #104666. inline long long abs(long num) { return labs(num); } #endif |