diff options
| author | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-10 23:00:13 (GMT) |
|---|---|---|
| committer | A-Team <ateam@pad.test.qt.nokia.com> | 2010-12-10 23:00:13 (GMT) |
| commit | d8b52dac5167bdf498d19d66ccb78fb12badf85a (patch) | |
| tree | d0048967e2089e4893baa4b576d57bfcf24656ca /src/corelib | |
| parent | a18714105029a54b4a3814d8e2e5ac2d45c233e9 (diff) | |
| parent | eabde99a0e9e4c5e49a05187530cf643258d5719 (diff) | |
| download | Qt-d8b52dac5167bdf498d19d66ccb78fb12badf85a.zip Qt-d8b52dac5167bdf498d19d66ccb78fb12badf85a.tar.gz Qt-d8b52dac5167bdf498d19d66ccb78fb12badf85a.tar.bz2 | |
Merge branch '4.7-upstream' into 4.7-doc
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qendian.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index d53504a..08415bf 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -44,9 +44,8 @@ #include <QtCore/qglobal.h> -#ifdef Q_OS_LINUX -# include <features.h> -#endif +// include stdlib.h and hope that it defines __GLIBC__ for glibc-based systems +#include <stdlib.h> #ifdef __GLIBC__ #include <byteswap.h> |