diff options
author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
---|---|---|
committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2017-06-27 06:07:23 +0000 |
commit | 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c (patch) | |
tree | 46dcd36c86e7fbc6e5df36deb463b33e9967a6f7 /Source/WTF/wtf/OSAllocatorWin.cpp | |
parent | 32761a6cee1d0dee366b885b7b9c777e67885688 (diff) | |
download | WebKitGtk-tarball-master.tar.gz |
webkitgtk-2.16.5HEADwebkitgtk-2.16.5master
Diffstat (limited to 'Source/WTF/wtf/OSAllocatorWin.cpp')
-rw-r--r-- | Source/WTF/wtf/OSAllocatorWin.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Source/WTF/wtf/OSAllocatorWin.cpp b/Source/WTF/wtf/OSAllocatorWin.cpp index 37e013013..6a457f423 100644 --- a/Source/WTF/wtf/OSAllocatorWin.cpp +++ b/Source/WTF/wtf/OSAllocatorWin.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Apple Inc. All rights reserved. + * Copyright (C) 2010, 2014 Apple Inc. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -73,6 +73,8 @@ void OSAllocator::decommit(void* address, size_t bytes) // See: https://bugs.webkit.org/show_bug.cgi?id=121972. if (!bytes) return; + // Silence warning about using MEM_DECOMMIT instead of MEM_RELEASE: +#pragma warning(suppress: 6250) bool result = VirtualFree(address, bytes, MEM_DECOMMIT); if (!result) CRASH(); @@ -91,6 +93,10 @@ void OSAllocator::releaseDecommitted(void* address, size_t bytes) CRASH(); } +void OSAllocator::hintMemoryNotNeededSoon(void*, size_t) +{ +} + } // namespace WTF #endif // OS(WINDOWS) |