diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-23 12:36:29 +0100 |
---|---|---|
committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-01-23 12:36:29 +0100 |
commit | 03fe99ba3a7d29b1606660baa407cff21c4d4d35 (patch) | |
tree | 525d5f03e8703bf7e9a7851280de67a597dceea1 /src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp | |
parent | f02e234fc012f4430378bc5205f32914822e4dff (diff) | |
parent | 94e6106d357ca5a1349a2b10a69dd84db34065c8 (diff) |
Merge remote-tracking branch 'origin/dev' into wip/scenegraphng
Change-Id: I762e578aaf14a77efa26ce3fda2abb0e335003ea
Diffstat (limited to 'src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp')
-rw-r--r-- | src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp index b7ad723f07..0a6eda8b98 100644 --- a/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp +++ b/src/3rdparty/masm/wtf/OSAllocatorWinRT.cpp @@ -32,19 +32,8 @@ #include "windows.h" #include <wtf/Assertions.h> -#if _MSC_VER >= 1900 // Try to use JIT by default and fallback to non-JIT on first error static bool qt_winrt_use_jit = true; -#else // _MSC_VER < 1900 -# define PAGE_EXECUTE 0x10 -# define PAGE_EXECUTE_READ 0x20 -# define PAGE_EXECUTE_READWRITE 0x40 -# define MEM_RELEASE 0x8000 -inline void* VirtualAllocFromApp(void*, size_t, int, int) { return 0; } -inline bool VirtualProtectFromApp(void *, size_t, int, DWORD*) { return false; } -inline bool VirtualFree(void *, size_t, DWORD) { return false; } -static bool qt_winrt_use_jit = false; -#endif // _MSC_VER < 1900 namespace WTF { |