diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-27 01:00:20 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-27 01:00:20 +0200 |
| commit | e282db62b1fca2ea133162bc6254595a42f4b861 (patch) | |
| tree | afb0bb98f19153e25f7f3c6b200d579e731baeae /src/3rdparty/masm/wtf/OSAllocator.h | |
| parent | 1b30e8f94cc15352583e8e1f27139676683f62af (diff) | |
| parent | 2f397aa15a13efbadf6c1bc378bb134ac1e655c5 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I280d42b8926c0cada1f35d322b80aaf2b0ef0a73
Diffstat (limited to 'src/3rdparty/masm/wtf/OSAllocator.h')
| -rw-r--r-- | src/3rdparty/masm/wtf/OSAllocator.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/3rdparty/masm/wtf/OSAllocator.h b/src/3rdparty/masm/wtf/OSAllocator.h index 933b3cda0a..366dd73993 100644 --- a/src/3rdparty/masm/wtf/OSAllocator.h +++ b/src/3rdparty/masm/wtf/OSAllocator.h @@ -73,6 +73,10 @@ public: static T* reallocateCommitted(T*, size_t oldSize, size_t newSize, Usage = UnknownUsage, bool writable = true, bool executable = false); static bool canAllocateExecutableMemory(); + +#if defined(Q_OS_INTEGRITY) + static void setMemoryAttributes(void* addr, bool writable, bool executable); +#endif }; inline void* OSAllocator::reserveAndCommit(size_t reserveSize, size_t commitSize, Usage usage, bool writable, bool executable) |