From e17513956503963f4d468342a5be6a0967aca97c Mon Sep 17 00:00:00 2001 From: François Andriot Date: Sun, 7 Sep 2014 00:51:50 +0200 Subject: Fix FTBFS on Linux specific memlock code --- src/tools/qstring.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/tools/qstring.cpp') diff --git a/src/tools/qstring.cpp b/src/tools/qstring.cpp index 210848c..1c796fe 100644 --- a/src/tools/qstring.cpp +++ b/src/tools/qstring.cpp @@ -1075,9 +1075,11 @@ QStringData::~QStringData() { if ( unicode ) { delete[] ((char*)unicode); } +#if defined(Q_OS_LINUX) if ( ascii && security_unpaged ) { munlock(ascii, LINUX_MEMLOCK_LIMIT_BYTES); } +#endif if ( ascii ) { delete[] ascii; } @@ -5953,15 +5955,19 @@ const char* QString::ascii() const void QString::setSecurityUnPaged(bool lock) { if (lock != d->security_unpaged) { if (d->security_unpaged) { +#if defined(Q_OS_LINUX) if (d->ascii) { munlock(d->ascii, LINUX_MEMLOCK_LIMIT_BYTES); } +#endif d->security_unpaged = false; } else { +#if defined(Q_OS_LINUX) if (d->ascii) { mlock(d->ascii, LINUX_MEMLOCK_LIMIT_BYTES); } +#endif d->security_unpaged = true; } } -- cgit v1.2.3