diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-11-19 19:35:00 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-11-19 19:35:00 (GMT) |
| commit | ca1fcd8e9cbedab190efdb456f78e5f604293b3b (patch) | |
| tree | 1294122bd5a8e1ae802d37d107594584444e0aab /src/corelib | |
| parent | 9743d1ae8dcec6b64bf497e76bd49a029c8f3ecc (diff) | |
| parent | 3bfaf7740d527f88b5910f16abdd0e71977a8a5b (diff) | |
| download | Qt-ca1fcd8e9cbedab190efdb456f78e5f604293b3b.zip Qt-ca1fcd8e9cbedab190efdb456f78e5f604293b3b.tar.gz Qt-ca1fcd8e9cbedab190efdb456f78e5f604293b3b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/tools/qlocale.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp index 6b1de5e..d152682 100644 --- a/src/corelib/tools/qlocale.cpp +++ b/src/corelib/tools/qlocale.cpp @@ -77,7 +77,7 @@ QT_END_NAMESPACE #include <qdebug.h> #include <time.h> -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__) # include <fenv.h> #endif @@ -6637,7 +6637,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *si _control87(MCW_EM, MCW_EM); #endif -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__) fenv_t envp; feholdexcept(&envp); #endif @@ -6653,7 +6653,7 @@ Q_CORE_EXPORT char *qdtoa ( double d, int mode, int ndigits, int *decpt, int *si #endif //_M_X64 #endif //Q_OS_WIN -#if defined(Q_OS_LINUX) && !defined(__UCLIBC__) +#if defined(__GLIBC__) && !defined(__UCLIBC__) fesetenv(&envp); #endif |