diff options
author | Reid Kleckner <reid@kleckner.net> | 2009-07-23 21:46:56 +0000 |
---|---|---|
committer | Reid Kleckner <reid@kleckner.net> | 2009-07-23 21:46:56 +0000 |
commit | 4b3a356493dfe6e40beb897d25d5a55c5951084e (patch) | |
tree | 4bb45b343961ff60ccb9f88b885a4618a4f5a416 /llvm/lib/System/Win32/Memory.inc | |
parent | 70e5526a617dea6cf32192f9c3170568fdd04712 (diff) | |
download | bcm5719-llvm-4b3a356493dfe6e40beb897d25d5a55c5951084e.tar.gz bcm5719-llvm-4b3a356493dfe6e40beb897d25d5a55c5951084e.zip |
Re-committing r76828 with the JIT memory manager changes now that the build
bots like the BumpPtrAllocator changes.
llvm-svn: 76902
Diffstat (limited to 'llvm/lib/System/Win32/Memory.inc')
-rw-r--r-- | llvm/lib/System/Win32/Memory.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/llvm/lib/System/Win32/Memory.inc b/llvm/lib/System/Win32/Memory.inc index 5e5cf7a6762..7611ecdb929 100644 --- a/llvm/lib/System/Win32/Memory.inc +++ b/llvm/lib/System/Win32/Memory.inc @@ -13,6 +13,7 @@ //===----------------------------------------------------------------------===// #include "Win32.h" +#include "llvm/Support/DataTypes.h" #include "llvm/System/Process.h" namespace llvm { @@ -23,13 +24,13 @@ using namespace sys; //=== and must not be UNIX code //===----------------------------------------------------------------------===// -MemoryBlock Memory::AllocateRWX(unsigned NumBytes, +MemoryBlock Memory::AllocateRWX(size_t NumBytes, const MemoryBlock *NearBlock, std::string *ErrMsg) { if (NumBytes == 0) return MemoryBlock(); - static const long pageSize = Process::GetPageSize(); - unsigned NumPages = (NumBytes+pageSize-1)/pageSize; + static const size_t pageSize = Process::GetPageSize(); + size_t NumPages = (NumBytes+pageSize-1)/pageSize; //FIXME: support NearBlock if ever needed on Win64. |