From dda46460fff56c0756adba0d63fd72b311bdbcc9 Mon Sep 17 00:00:00 2001 From: Damien George Date: Wed, 3 Sep 2014 22:47:23 +0100 Subject: Code style/whitespace cleanup; remove obsolete headers. And move the MAP_ANON redefinition from py/asmx64.c to unix/alloc.c. --- unix/alloc.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'unix/alloc.c') diff --git a/unix/alloc.c b/unix/alloc.c index 2c09f1846..cb866c78a 100644 --- a/unix/alloc.c +++ b/unix/alloc.c @@ -30,8 +30,11 @@ #include "mpconfigport.h" -void mp_unix_alloc_exec(mp_uint_t min_size, void** ptr, mp_uint_t *size) -{ +#if defined(__OpenBSD__) || defined(__MACH__) +#define MAP_ANONYMOUS MAP_ANON +#endif + +void mp_unix_alloc_exec(mp_uint_t min_size, void **ptr, mp_uint_t *size) { // size needs to be a multiple of the page size *size = (min_size + 0xfff) & (~0xfff); *ptr = mmap(NULL, *size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); @@ -40,7 +43,6 @@ void mp_unix_alloc_exec(mp_uint_t min_size, void** ptr, mp_uint_t *size) } } -void mp_unix_free_exec(void *ptr, mp_uint_t size) -{ +void mp_unix_free_exec(void *ptr, mp_uint_t size) { munmap(ptr, size); } -- cgit v1.2.3