diff options
-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) |