diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-10-01 12:39:45 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-10-01 12:39:45 +0000 |
| commit | 1dce83ba31e0e480b8eae43c1fc59c6cd5bb4d5c (patch) | |
| tree | 81c96fe47896b4a238a97fcba3bb973b50156a6d /src/3rdparty/masm/wtf/OSAllocator.h | |
| parent | 91bde278ea2e883b4a46cafb1afc1781c71c1590 (diff) | |
| parent | 87662fd1b71db11f0759e0be03d8a288ee11b775 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into refs/staging/5.12
Diffstat (limited to 'src/3rdparty/masm/wtf/OSAllocator.h')
| -rw-r--r-- | src/3rdparty/masm/wtf/OSAllocator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/masm/wtf/OSAllocator.h b/src/3rdparty/masm/wtf/OSAllocator.h index 366dd73993..9648a4e08f 100644 --- a/src/3rdparty/masm/wtf/OSAllocator.h +++ b/src/3rdparty/masm/wtf/OSAllocator.h @@ -75,7 +75,7 @@ public: static bool canAllocateExecutableMemory(); #if defined(Q_OS_INTEGRITY) - static void setMemoryAttributes(void* addr, bool writable, bool executable); + static void setMemoryAttributes(void* addr, size_t size, bool writable, bool executable); #endif }; |