summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorHarald Fernengel <harald.fernengel@nokia.com>2011-02-23 09:06:12 (GMT)
committerHarald Fernengel <harald.fernengel@nokia.com>2011-02-23 09:06:56 (GMT)
commit41f529e5eb74617d7e4e7e3045307333187c18bc (patch)
tree894195cc430c9a79acc949f724aa96a3eb75a115 /src/gui/text
parent8c26d65c8ea9bd8f102c19d6de1750cbba2985c1 (diff)
downloadQt-41f529e5eb74617d7e4e7e3045307333187c18bc.zip
Qt-41f529e5eb74617d7e4e7e3045307333187c18bc.tar.gz
Qt-41f529e5eb74617d7e4e7e3045307333187c18bc.tar.bz2
Ammend INTEGRITY fixes
Unbreak normal QWS build again
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontengine_qws.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
index b1719b3..b71c4a7 100644
--- a/src/gui/text/qfontengine_qws.cpp
+++ b/src/gui/text/qfontengine_qws.cpp
@@ -57,9 +57,7 @@
#include "qfile.h"
#include "qdir.h"
-#if defined(Q_OS_INTEGRITY)
#define QT_USE_MMAP
-#endif
#include <stdlib.h>
#ifdef QT_USE_MMAP
@@ -409,7 +407,10 @@ static void *qt_mmap(void *start, size_t length, int /*prot*/, int /*flags*/, in
return buf;
}
#else
-# define qt_mmap ::mmap
+static inline void *qt_mmap(void *start, size_t length, int prot, int flags, int fd, off_t offset)
+{
+ return mmap(start, length, prot, flags, fd, offset);
+}
#endif