diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 07:06:59 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-10-26 07:06:59 (GMT) |
| commit | 9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427 (patch) | |
| tree | 37ae0ceb0eb9d4f74683b02bf3187cfd7f694c6c /src/corelib/global/qglobal.h | |
| parent | 2c0921b667ec74df6ad3d749b30bb9b7c5843343 (diff) | |
| parent | 35c8033ff51ab6d0567e786b790b8cc49852803b (diff) | |
| download | Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.zip Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.gz Qt-9a1ee410d24321e7eedaea6bb4f1b21fcc6fb427.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index df17546..5ee1815 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -466,7 +466,7 @@ namespace QT_NAMESPACE {} # define Q_NO_USING_KEYWORD # define QT_NO_STL_WCHAR # endif -# if __GNUC__ >= 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) +# if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 95) # define Q_ALIGNOF(type) __alignof__(type) # define Q_TYPEOF(expr) __typeof__(expr) # define Q_DECL_ALIGN(n) __attribute__((__aligned__(n))) |