diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-26 10:36:32 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-01-26 10:36:32 +0100 |
| commit | 0906ae8ae7df09ec775ef2f038e4924a5de95a33 (patch) | |
| tree | f4b2821ee37d669445ad8184a423bd439136e977 /src/3rdparty | |
| parent | 9a5568a1972b72b32ae3058903cc7f4d7123b96b (diff) | |
| parent | 0825d24cf5c35a7c6fe37088f23b793e33c69063 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: If45606c96ef130588004598c560aa790373f0a78
Diffstat (limited to 'src/3rdparty')
| -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 |