diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-16 18:12:24 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-11-16 18:12:24 (GMT) |
| commit | b0d54f150e9b4211e263b4835dd2c64ac07a8c86 (patch) | |
| tree | 2fd560a86cdd7e043c3cc6d317b9c232c670a7ed /src | |
| parent | 23f3c60c42ffc42acee823ba8041b9474cc15133 (diff) | |
| parent | ff8486f8326e214faa08eacc8e91b5333d68e912 (diff) | |
| download | Qt-b0d54f150e9b4211e263b4835dd2c64ac07a8c86.zip Qt-b0d54f150e9b4211e263b4835dd2c64ac07a8c86.tar.gz Qt-b0d54f150e9b4211e263b4835dd2c64ac07a8c86.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Rebuild configure.exe with support for MinGW 4.6
Windows: Add gcc 4.6.
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qlocale_tools.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/tools/qlocale_tools.cpp b/src/corelib/tools/qlocale_tools.cpp index df31bf9..750379c 100644 --- a/src/corelib/tools/qlocale_tools.cpp +++ b/src/corelib/tools/qlocale_tools.cpp @@ -2253,6 +2253,13 @@ static int quorem(Bigint *b, Bigint *S) * calculation. */ +#if defined(Q_OS_WIN) && defined (Q_CC_GNU) && !defined(_clear87) // See QTBUG-7576 +extern "C" { +__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask); +__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */ +} +# define _clear87 _clearfp +#endif /* This actually sometimes returns a pointer to a string literal cast to a char*. Do NOT try to modify the return value. */ |