From 5d8f37ad78fc66901af50c762029a501561f3b23 Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Mon, 14 Sep 2009 14:32:27 -0700 Subject: Merge upstream QEMU 10.0.50 into the Android source tree. This change integrates many changes from the upstream QEMU sources. Its main purpose is to enable correct ARMv6 and ARMv7 support to the Android emulator. Due to the nature of the upstream code base, this unfortunately also required changes to many other parts of the source. Note that to ensure easier integrations in the future, some source files and directories that have heavy Android-specific customization have been renamed with an -android suffix. The original files are still there for easier integration tracking, but *never* compiled. For example: net.c net-android.c qemu-char.c qemu-char-android.c slirp/ slirp-android/ etc... Tested on linux-x86, darwin-x86 and windows host machines. --- osdep.h | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) (limited to 'osdep.h') diff --git a/osdep.h b/osdep.h index 626cea1..ffbf221 100644 --- a/osdep.h +++ b/osdep.h @@ -7,6 +7,10 @@ #include #endif +#ifndef _WIN32 +#include +#endif + #ifndef glue #define xglue(x, y) x ## y #define glue(x, y) xglue(x, y) @@ -14,12 +18,6 @@ #define tostring(s) #s #endif -#ifndef container_of -#define container_of(ptr, type, member) ({ \ - const typeof(((type *) 0)->member) *__mptr = (ptr); \ - (type *) ((char *) __mptr - offsetof(type, member));}) -#endif - #ifndef likely #if __GNUC__ < 3 #define __builtin_expect(x, n) (x) @@ -54,8 +52,10 @@ #define always_inline inline #else #define always_inline __attribute__ (( always_inline )) __inline__ +#ifdef __OPTIMIZE__ #define inline always_inline #endif +#endif #else #define inline always_inline #endif @@ -68,6 +68,13 @@ #define qemu_printf printf +#if defined (__GNUC__) && defined (__GNUC_MINOR__) +# define QEMU_GNUC_PREREQ(maj, min) \ + ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) +#else +# define QEMU_GNUC_PREREQ(maj, min) 0 +#endif + void *qemu_memalign(size_t alignment, size_t size); void *qemu_vmalloc(size_t size); void qemu_vfree(void *ptr); -- cgit v1.1