diff options
| author | David 'Digit' Turner <digit@android.com> | 2010-05-10 16:48:20 -0700 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2010-05-10 16:49:50 -0700 |
| commit | 2c538c86c15d597cc875dc926e4e39285c5625df (patch) | |
| tree | fd02b6da79b5e1375ab2ec5264ab339044e4a7da /osdep.c | |
| parent | 5e097bf40ed22b422dce1fb2c58098d6c97cf0c6 (diff) | |
| download | external_qemu-2c538c86c15d597cc875dc926e4e39285c5625df.zip external_qemu-2c538c86c15d597cc875dc926e4e39285c5625df.tar.gz external_qemu-2c538c86c15d597cc875dc926e4e39285c5625df.tar.bz2 | |
Upstream: Use CONFIG_BSD instead of _BSD and HOST_BSD
Also fix OS X build, which failed with a link error.
Change-Id: Idd63f25dc1f46ea66da5727c7577def34f048c3c
Diffstat (limited to 'osdep.c')
| -rw-r--r-- | osdep.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -28,7 +28,7 @@ #include <errno.h> #include <unistd.h> #include <fcntl.h> -#ifdef HOST_SOLARIS +#ifdef CONFIG_SOLARIS #include <sys/types.h> #include <sys/statvfs.h> #endif @@ -39,7 +39,7 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include <windows.h> -#elif defined(_BSD) +#elif defined(CONFIG_BSD) #include <stdlib.h> #else #include <malloc.h> @@ -95,7 +95,7 @@ static void *kqemu_vmalloc(size_t size) int map_anon = 0; const char *tmpdir; char phys_ram_file[1024]; -#ifdef HOST_SOLARIS +#ifdef CONFIG_SOLARIS struct statvfs stfs; #else struct statfs stfs; @@ -104,7 +104,7 @@ static void *kqemu_vmalloc(size_t size) if (phys_ram_fd < 0) { tmpdir = getenv("QEMU_TMPDIR"); if (!tmpdir) -#ifdef HOST_SOLARIS +#ifdef CONFIG_SOLARIS tmpdir = "/tmp"; if (statvfs(tmpdir, &stfs) == 0) { #else @@ -185,7 +185,7 @@ void *qemu_memalign(size_t alignment, size_t size) if (ret != 0) return NULL; return ptr; -#elif defined(HOST_BSD) +#elif defined(CONFIG_BSD) return valloc(size); #else return memalign(alignment, size); |