From 41f529e5eb74617d7e4e7e3045307333187c18bc Mon Sep 17 00:00:00 2001
From: Harald Fernengel <harald.fernengel@nokia.com>
Date: Wed, 23 Feb 2011 10:06:12 +0100
Subject: Ammend INTEGRITY fixes

Unbreak normal QWS build again
---
 src/gui/text/qfontengine_qws.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'src/gui/text/qfontengine_qws.cpp')

diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
index b1719b34bb..b71c4a7aba 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
 
 
-- 
cgit v1.2.3