diff options
Diffstat (limited to 'oslib-posix.c')
| -rw-r--r-- | oslib-posix.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/oslib-posix.c b/oslib-posix.c index b6a3c7f..6b7ba64 100644 --- a/oslib-posix.c +++ b/oslib-posix.c @@ -105,6 +105,8 @@ void *qemu_memalign(size_t alignment, size_t size) return ptr; } +/* conflicts with qemu_vmalloc in bsd-user/mmap.c */ +#if !defined(CONFIG_BSD_USER) /* alloc shared memory pages */ void *qemu_vmalloc(size_t size) { @@ -127,6 +129,7 @@ void *qemu_vmalloc(size_t size) trace_qemu_vmalloc(size, ptr); return ptr; } +#endif void qemu_vfree(void *ptr) { |