diff options
| author | Tomas Carnecky <tomas.carnecky@gmail.com> | 2016-05-19 21:03:42 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-05-19 21:34:44 +0200 |
| commit | 8abc193dd3117adae126d43da3ae04cb045808da (patch) | |
| tree | ef792768d7bbb111880015100f063c80b047a788 | |
| parent | f0f351775dfb157889c42863b00a2b331bb422eb (diff) | |
| download | haskell-8abc193dd3117adae126d43da3ae04cb045808da.tar.gz | |
Get types in osFreeMBlocks in sync with osGetMBlocks
The first argument of 'osFreeMBlocks' ought to have the same type as the
return value from 'osGetMBlocks'. Make it so.
Reviewers: austin, simonmar, bgamari
Reviewed By: bgamari
Subscribers: erikd, rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D2235
| -rw-r--r-- | rts/posix/OSMem.c | 2 | ||||
| -rw-r--r-- | rts/sm/OSMem.h | 2 | ||||
| -rw-r--r-- | rts/win32/OSMem.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c index 4e6ecc2494..5c997ababb 100644 --- a/rts/posix/OSMem.c +++ b/rts/posix/OSMem.c @@ -294,7 +294,7 @@ osGetMBlocks(uint32_t n) return ret; } -void osFreeMBlocks(char *addr, uint32_t n) +void osFreeMBlocks(void *addr, uint32_t n) { munmap(addr, n * MBLOCK_SIZE); } diff --git a/rts/sm/OSMem.h b/rts/sm/OSMem.h index defa0d408c..a9d4fc9cd2 100644 --- a/rts/sm/OSMem.h +++ b/rts/sm/OSMem.h @@ -13,7 +13,7 @@ void osMemInit(void); void *osGetMBlocks(uint32_t n); -void osFreeMBlocks(char *addr, uint32_t n); +void osFreeMBlocks(void *addr, uint32_t n); void osReleaseFreeMemory(void); void osFreeAllMBlocks(void); W_ getPageSize (void); diff --git a/rts/win32/OSMem.c b/rts/win32/OSMem.c index 65791b69d1..c51aab7d20 100644 --- a/rts/win32/OSMem.c +++ b/rts/win32/OSMem.c @@ -246,7 +246,7 @@ static void decommitBlocks(char *addr, W_ nBytes) } } -void osFreeMBlocks(char *addr, uint32_t n) +void osFreeMBlocks(void *addr, uint32_t n) { W_ nBytes = (W_)n * MBLOCK_SIZE; |