aboutsummaryrefslogtreecommitdiff
path: root/bsd-user
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2013-01-19 09:49:09 +0000
committerBlue Swirl <blauwirbel@gmail.com>2013-01-26 13:18:27 +0000
commit0360ccffbe41bd732b42a90cd04de63335933bea (patch)
tree935ae23c73253fd16cf324bdc80b18269736bb58 /bsd-user
parent82cb6b041c307bd96c067147af69cd98be91a682 (diff)
downloadqemu-0360ccffbe41bd732b42a90cd04de63335933bea.zip
qemu-0360ccffbe41bd732b42a90cd04de63335933bea.tar.gz
qemu-0360ccffbe41bd732b42a90cd04de63335933bea.tar.bz2
bsd-user: avoid conflict with qemu_vmalloc
Rename qemu_vmalloc() to bsd_vmalloc(), adjust the only user. Remove #ifdeffery in oslib-posix.c. Tested-by: Andreas Färber <andreas.faerber@web.de> Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
Diffstat (limited to 'bsd-user')
-rw-r--r--bsd-user/mmap.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/bsd-user/mmap.c b/bsd-user/mmap.c
index 5d6cffc..aae8ea1 100644
--- a/bsd-user/mmap.c
+++ b/bsd-user/mmap.c
@@ -74,7 +74,7 @@ void mmap_unlock(void)
}
#endif
-void *qemu_vmalloc(size_t size)
+static void *bsd_vmalloc(size_t size)
{
void *p;
mmap_lock();
@@ -98,7 +98,7 @@ void *g_malloc(size_t size)
{
char * p;
size += 16;
- p = qemu_vmalloc(size);
+ p = bsd_vmalloc(size);
*(size_t *)p = size;
return p + 16;
}