diff options
| author | Araq <rumpf_a@web.de> | 2016-03-29 15:30:44 +0200 |
|---|---|---|
| committer | Araq <rumpf_a@web.de> | 2016-03-29 15:31:10 +0200 |
| commit | db2b2156581ffaaa63e7ff9c0a07ced540006956 (patch) | |
| tree | 341535aa355ef422ee886f7b14fda6fbfeae0523 /lib/system/osalloc.nim | |
| parent | 8bf14b12a963980e71ad46e16a8a2e35c9465b8c (diff) | |
| parent | b4f1eef3a3b0ff56d0a68c15c43ffecb7778e939 (diff) | |
| download | Nim-db2b2156581ffaaa63e7ff9c0a07ced540006956.tar.gz | |
resolved merge conflicts
Diffstat (limited to 'lib/system/osalloc.nim')
| -rw-r--r-- | lib/system/osalloc.nim | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/system/osalloc.nim b/lib/system/osalloc.nim index cc1a28213..78410d716 100644 --- a/lib/system/osalloc.nim +++ b/lib/system/osalloc.nim @@ -94,7 +94,7 @@ elif defined(posix): proc mmap(adr: pointer, len: int, prot, flags, fildes: cint, off: int): pointer {.header: "<sys/mman.h>".} - proc munmap(adr: pointer, len: int) {.header: "<sys/mman.h>".} + proc munmap(adr: pointer, len: int): cint {.header: "<sys/mman.h>".} proc osAllocPages(size: int): pointer {.inline.} = result = mmap(nil, size, PROT_READ or PROT_WRITE, @@ -108,7 +108,7 @@ elif defined(posix): if result == cast[pointer](-1): result = nil proc osDeallocPages(p: pointer, size: int) {.inline} = - when reallyOsDealloc: munmap(p, size) + when reallyOsDealloc: discard munmap(p, size) elif defined(windows): const |