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>
This commit is contained in:
Holger Hans Peter Freyther 2011-11-15 21:43:52 +01:00 committed by Qt by Nokia
parent bb4dbafbb1
commit 01c795bcd1
2 changed files with 8 additions and 4 deletions

View File

@ -50,7 +50,11 @@
#include <qlocale.h> #include <qlocale.h>
#include <qnumeric.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> # include <fenv.h>
#endif #endif
@ -729,7 +733,7 @@ void tst_QLocale::fpExceptions()
_control87( 0 | _EM_INEXACT, _MCW_EM ); _control87( 0 | _EM_INEXACT, _MCW_EM );
#endif #endif
#ifdef Q_OS_LINUX #ifdef QT_USE_FENV
fenv_t envp; fenv_t envp;
fegetenv(&envp); fegetenv(&envp);
feclearexcept(FE_ALL_EXCEPT); feclearexcept(FE_ALL_EXCEPT);
@ -747,7 +751,7 @@ void tst_QLocale::fpExceptions()
_control87(oldbits, 0xFFFFF); _control87(oldbits, 0xFFFFF);
#endif #endif
#ifdef Q_OS_LINUX #ifdef QT_USE_FENV
fesetenv(&envp); fesetenv(&envp);
#endif #endif
} }

View File

@ -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> #include <fenv.h>
static const QString fpeExceptionString(int exception) static const QString fpeExceptionString(int exception)