diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-01-06 22:24:26 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-01-06 22:24:26 +0100 |
| commit | 747f7d13e472f42742f74fdfa70ffd6b2998362e (patch) | |
| tree | c498d51a01a37282d5d107cde9df259cb7e2a973 | |
| parent | 266fe5e187099f280d75be8f2dde2e2c29f285d5 (diff) | |
| download | external_qemu-747f7d13e472f42742f74fdfa70ffd6b2998362e.zip external_qemu-747f7d13e472f42742f74fdfa70ffd6b2998362e.tar.gz external_qemu-747f7d13e472f42742f74fdfa70ffd6b2998362e.tar.bz2 | |
Fix Darwin build.
The reason for the build breakage is still mysterious though.
Were the system headers updated during the last system update ?!?
Change-Id: Ib0ea2b54bf7ffad907752c3a82fb4bbe686425a5
| -rw-r--r-- | Makefile.android | 2 | ||||
| -rw-r--r-- | osdep.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.android b/Makefile.android index 271fc49..8bd9b65 100644 --- a/Makefile.android +++ b/Makefile.android @@ -59,7 +59,7 @@ ifeq ($(HOST_ARCH),ppc) endif ifeq ($(HOST_OS),darwin) - MY_CFLAGS += -mdynamic-no-pic + MY_CFLAGS += -mdynamic-no-pic -D_DARWIN_C_SOURCE=1 # When building on Leopard or above, we need to use the 10.4 SDK # or the generated binary will not run on Tiger. @@ -63,7 +63,7 @@ typedef int32_t socklen_t; #include "sysemu.h" #include "qemu_socket.h" -#if !defined(_POSIX_C_SOURCE) || defined(_WIN32) || defined(__sun__) +#if !defined(_POSIX_C_SOURCE) || defined(_WIN32) || defined(__sun__) || defined(__APPLE__) static void *oom_check(void *ptr) { if (ptr == NULL) { @@ -107,7 +107,7 @@ void qemu_vfree(void *ptr) void *qemu_memalign(size_t alignment, size_t size) { -#if defined(_POSIX_C_SOURCE) && !defined(__sun__) +#if defined(_POSIX_C_SOURCE) && !defined(__sun__) && !defined(__APPLE__) int ret; void *ptr; ret = posix_memalign(&ptr, alignment, size); |