diff options
author | Holger Hans Peter Freyther <holger@moiji-mobile.com> | 2011-11-15 21:43:52 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-22 15:17:08 +0100 |
commit | 01c795bcd13e31044e3a3f4f61b218d8ad02845e (patch) | |
tree | 77ed8096a262f843fb2683323a71c4348572d0aa /tests/auto | |
parent | bb4dbafbb1f4ad13eb1c4f6a798051310c4d2208 (diff) |
uclibc: fenv.h does not define the necessary things.
libstdc++ provides the fenv.h found and for uclibc default toolchains
the bits/c++config.h has _GLIBCXX_HAVE_FENV_H undefined leading to
no import of the uclibc fenv.h
Change-Id: I53173b099f3d8791f527f1ccb60991de57cd19db
Filed: https://bugs.busybox.net/show_bug.cgi?id=4484
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/corelib/tools/qlocale/tst_qlocale.cpp | 10 | ||||
-rw-r--r-- | tests/auto/gui/painting/qpainter/tst_qpainter.cpp | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp index 9a41db153a..a5a247f15a 100644 --- a/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp +++ b/tests/auto/corelib/tools/qlocale/tst_qlocale.cpp @@ -50,7 +50,11 @@ #include <qlocale.h> #include <qnumeric.h> -#ifdef Q_OS_LINUX +#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +# define QT_USE_FENV +#endif + +#ifdef QT_USE_FENV # include <fenv.h> #endif @@ -729,7 +733,7 @@ void tst_QLocale::fpExceptions() _control87( 0 | _EM_INEXACT, _MCW_EM ); #endif -#ifdef Q_OS_LINUX +#ifdef QT_USE_FENV fenv_t envp; fegetenv(&envp); feclearexcept(FE_ALL_EXCEPT); @@ -747,7 +751,7 @@ void tst_QLocale::fpExceptions() _control87(oldbits, 0xFFFFF); #endif -#ifdef Q_OS_LINUX +#ifdef QT_USE_FENV fesetenv(&envp); #endif } diff --git a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp index 529bb3ee20..bd4d16fcbb 100644 --- a/tests/auto/gui/painting/qpainter/tst_qpainter.cpp +++ b/tests/auto/gui/painting/qpainter/tst_qpainter.cpp @@ -2598,7 +2598,7 @@ void tst_QPainter::monoImages() } } -#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) +#if !defined(Q_OS_IRIX) && !defined(Q_OS_AIX) && !defined(Q_CC_MSVC) && !defined(Q_OS_SOLARIS) && !defined(__UCLIBC__) #include <fenv.h> static const QString fpeExceptionString(int exception) |