diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-11-17 18:08:02 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-11-17 18:08:02 (GMT) |
| commit | 346953b985deb5003e801b23063daf3f6dee3824 (patch) | |
| tree | bd96e90a23ce3fcfec6a0a471d558eb4c05d76f8 | |
| parent | 62d1149357736a0dd9b8a439edb73c30f6d407ad (diff) | |
| download | Qt-346953b985deb5003e801b23063daf3f6dee3824.zip Qt-346953b985deb5003e801b23063daf3f6dee3824.tar.gz Qt-346953b985deb5003e801b23063daf3f6dee3824.tar.bz2 | |
Use GLIBC functions on any GLIBC architecture.
Make use of __GLIBC__ instead of Q_OS_LINUX for functions available
globally in GNU libc, not just on Linux.
the !__UCLIBC__ are still needed, as uClibc defines __GLIBC__ for
compatibility with a lot of applications which rely on it.
Task-number: QTBUG-15401
| -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 |