summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-09-21 10:49:00 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-09-21 10:49:00 (GMT)
commitbfeb62c5bb6aa6119555ca8d489250ad3cf5c15f (patch)
treee91559828dde79ffadb1bf88ff7419e54ea9436e /src/corelib/global
parenta2d38842317977d78a3c0bfd227db18f505d96bd (diff)
downloadQt-bfeb62c5bb6aa6119555ca8d489250ad3cf5c15f.zip
Qt-bfeb62c5bb6aa6119555ca8d489250ad3cf5c15f.tar.gz
Qt-bfeb62c5bb6aa6119555ca8d489250ad3cf5c15f.tar.bz2
Use regparm(3) for ICC too, otherwise it's an ABI mismatch in QChar
Reviewed-By: Bradley T. Hughes
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 8f27b03..a1641cb 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1050,7 +1050,7 @@ redefine to built-in booleans to make autotests work properly */
#if defined(__i386__) || defined(_WIN32) || defined(_WIN32_WCE)
# if defined(Q_CC_GNU)
-#if !defined(Q_CC_INTEL) && ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332)
+#if ((100*(__GNUC__ - 0) + 10*(__GNUC_MINOR__ - 0) + __GNUC_PATCHLEVEL__) >= 332)
# define QT_FASTCALL __attribute__((regparm(3)))
#else
# define QT_FASTCALL