notaz.gp2x.de
/
picodrive.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
6f1133b
)
Fixed plat_mmap regression - Win32 now uses the same plat_mmap
author
twinaphex
<libretro@gmail.com>
Wed, 14 Aug 2013 01:01:59 +0000
(
03:01
+0200)
committer
notaz
<notasas@gmail.com>
Thu, 15 Aug 2013 00:27:14 +0000
(
03:27
+0300)
codepath
platform/libretro.c
patch
|
blob
|
blame
|
history
diff --git
a/platform/libretro.c
b/platform/libretro.c
index
a059157
..
c02b206
100644
(file)
--- a/
platform/libretro.c
+++ b/
platform/libretro.c
@@
-169,19
+169,6
@@
static void munmap(void *addr, size_t length)
#endif
void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
{
#endif
void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
{
-#ifndef _WIN32
- int flags = 0;
- void *ret = mmap((void*)addr,size,PROT_READ | PROT_WRITE, flags, -1, 0);
- if (addr != 0 && ret != (void *)addr) {
- lprintf("warning: wanted to map @%08lx, got %p\n",
- addr, ret);
-
- if (is_fixed) {
- munmap(ret, size);
- return NULL;
- }
- }
-#else
int flags = MAP_PRIVATE | MAP_ANONYMOUS;
void *req, *ret;
int flags = MAP_PRIVATE | MAP_ANONYMOUS;
void *req, *ret;
@@
-201,7
+188,6
@@
void *plat_mmap(unsigned long addr, size_t size, int need_exec, int is_fixed)
return NULL;
}
}
return NULL;
}
}
-#endif
return ret;
}
return ret;
}