summaryrefslogtreecommitdiffstats
path: root/src/corelib/global
diff options
context:
space:
mode:
authorHarald Fernengel <harald@trolltech.com>2009-08-13 14:00:21 (GMT)
committerHarald Fernengel <harald@trolltech.com>2009-08-13 14:00:21 (GMT)
commitf8b7834ae376c07254cee9f43e38ba74674eaa4a (patch)
treec81f33955d802b5b174c9b0aad100bd84c620e3f /src/corelib/global
parent42152e352e4d5f3bbe23c5fb160991da7048967d (diff)
downloadQt-f8b7834ae376c07254cee9f43e38ba74674eaa4a.zip
Qt-f8b7834ae376c07254cee9f43e38ba74674eaa4a.tar.gz
Qt-f8b7834ae376c07254cee9f43e38ba74674eaa4a.tar.bz2
Clean up platform defines a bit
As per Marius' S-O's request :)
Diffstat (limited to 'src/corelib/global')
-rw-r--r--src/corelib/global/qglobal.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index a184f01..2a71e29 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -2461,7 +2461,7 @@ bool qputenv(const char *varName, const QByteArray& value)
#endif
}
-#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD)
+#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
# if defined(Q_OS_INTEGRITY) && defined(__GHS_VERSION_NUMBER) && (__GHS_VERSION_NUMBER < 500)
// older versions of INTEGRITY used a long instead of a uint for the seed.
@@ -2471,9 +2471,7 @@ typedef uint SeedStorageType;
# endif
typedef QThreadStorage<SeedStorageType *> SeedStorage;
-#if defined(Q_OS_UNIX) && !defined(QT_NO_THREAD) && !defined(Q_OS_SYMBIAN)
Q_GLOBAL_STATIC(SeedStorage, randTLS) // Thread Local Storage for seed value
-#endif
#endif