diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-18 23:00:13 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-11-18 23:00:13 (GMT) |
| commit | 3bfaf7740d527f88b5910f16abdd0e71977a8a5b (patch) | |
| tree | 4cb532894de43d5141dbb9bf5375e75a1b9308f0 /src/corelib | |
| parent | 755313173cef5e61d823337bf4aca2807a98769f (diff) | |
| parent | 4082e4711a1c54947429b15504caf778c6da22d0 (diff) | |
| download | Qt-3bfaf7740d527f88b5910f16abdd0e71977a8a5b.zip Qt-3bfaf7740d527f88b5910f16abdd0e71977a8a5b.tar.gz Qt-3bfaf7740d527f88b5910f16abdd0e71977a8a5b.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
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 |