diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-15 00:00:10 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-15 00:00:10 (GMT) |
| commit | d8df35d7949a619cb9ca86bf111fd892d06f674a (patch) | |
| tree | 0eab085b5e4e03b36d06f64e0f9908955187c975 /src/corelib/global | |
| parent | a8759624f80cbad50a94aacb955c75fbad3613e4 (diff) | |
| parent | d6dace9bebd8a8ad8caaecb69dd24dd1ddf96f4a (diff) | |
| download | Qt-d8df35d7949a619cb9ca86bf111fd892d06f674a.zip Qt-d8df35d7949a619cb9ca86bf111fd892d06f674a.tar.gz Qt-d8df35d7949a619cb9ca86bf111fd892d06f674a.tar.bz2 | |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'src/corelib/global')
| -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 e0e946b..d7c5ee7 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> |