From 3d225ef9082fd4df12dd1c11ada54a3cd75b5132 Mon Sep 17 00:00:00 2001 From: Romain TISSERAND Date: Mon, 3 Jun 2024 08:07:11 +0200 Subject: Try to fix mmap64 already defined error in custommem.c (#1552) --- src/custommem.c | 27 +-------------------------- 1 file changed, 1 insertion(+), 26 deletions(-) (limited to 'src/custommem.c') diff --git a/src/custommem.c b/src/custommem.c index 476a6837..e5cf2e46 100644 --- a/src/custommem.c +++ b/src/custommem.c @@ -66,7 +66,7 @@ rbtree* memprot = NULL; int have48bits = 0; static int inited = 0; -static rbtree* mapallmem = NULL; +rbtree* mapallmem = NULL; static rbtree* mmapmem = NULL; typedef struct blocklist_s { @@ -1713,28 +1713,3 @@ int internal_munmap(void* addr, unsigned long length) #endif return ret; } - -void* my_mmap64(x64emu_t* emu, void *addr, unsigned long length, int prot, int flags, int fd, ssize_t offset); - -extern int running32bits; -EXPORT void* mmap64(void *addr, unsigned long length, int prot, int flags, int fd, ssize_t offset) -{ - void* ret; - if(!addr && ((running32bits && box64_mmap32) || (flags&0x40))) - ret = my_mmap64(NULL, addr, length, prot, flags | 0x40, fd, offset); - else - ret = internal_mmap(addr, length, prot, flags, fd, offset); - if(ret!=MAP_FAILED && mapallmem) - setProtection((uintptr_t)ret, length, prot); - return ret; -} -EXPORT void* mmap(void *addr, unsigned long length, int prot, int flags, int fd, ssize_t offset) __attribute__((alias("mmap64"))); - -EXPORT int munmap(void* addr, unsigned long length) -{ - int ret = internal_munmap(addr, length); - if(!ret && mapallmem) { - freeProtection((uintptr_t)addr, length); - } - return ret; -} -- cgit 1.4.1