diff options
| author | Reid Kleckner <reid@kleckner.net> | 2009-07-23 01:40:54 +0000 |
|---|---|---|
| committer | Reid Kleckner <reid@kleckner.net> | 2009-07-23 01:40:54 +0000 |
| commit | 921673225cee9a4d5b3ee6372fb15d851e82a238 (patch) | |
| tree | 91e9aa919566f97de1deffc7d86f3630f3f4ad18 /llvm/lib/System/Unix | |
| parent | 57421f3e0f205798259ce9066ba04c62de951bda (diff) | |
| download | bcm5719-llvm-921673225cee9a4d5b3ee6372fb15d851e82a238.tar.gz bcm5719-llvm-921673225cee9a4d5b3ee6372fb15d851e82a238.zip | |
Reverting r76825 and r76828, since they caused clang runtime errors and some build failure involving memset.
llvm-svn: 76838
Diffstat (limited to 'llvm/lib/System/Unix')
| -rw-r--r-- | llvm/lib/System/Unix/Memory.inc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/llvm/lib/System/Unix/Memory.inc b/llvm/lib/System/Unix/Memory.inc index a80f56fbc14..b7a70135bcb 100644 --- a/llvm/lib/System/Unix/Memory.inc +++ b/llvm/lib/System/Unix/Memory.inc @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// #include "Unix.h" -#include "llvm/Support/DataTypes.h" #include "llvm/System/Process.h" #ifdef HAVE_SYS_MMAN_H @@ -29,12 +28,12 @@ /// is very OS specific. /// llvm::sys::MemoryBlock -llvm::sys::Memory::AllocateRWX(size_t NumBytes, const MemoryBlock* NearBlock, +llvm::sys::Memory::AllocateRWX(unsigned NumBytes, const MemoryBlock* NearBlock, std::string *ErrMsg) { if (NumBytes == 0) return MemoryBlock(); - size_t pageSize = Process::GetPageSize(); - size_t NumPages = (NumBytes+pageSize-1)/pageSize; + unsigned pageSize = Process::GetPageSize(); + unsigned NumPages = (NumBytes+pageSize-1)/pageSize; int fd = -1; #ifdef NEED_DEV_ZERO_FOR_MMAP |
