From df2542c737ea2f7148136b6525cd56f6fc276d69 Mon Sep 17 00:00:00 2001 From: j_mayer Date: Mon, 19 Nov 2007 00:38:33 +0000 Subject: Avoid duplicated definitions: move common definitions from exec-all.h and qemu-common.h to osdep.h. Include this header in translate-op.c. Make sure it's included first in darwin-user/qemu.h. To avoid discarded inlining bug, define inline as always_inline and always_inline as (( attribute (always_inline) )) __inline__. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3698 c046a42c-6fe2-441c-8c8c-71466251a162 --- qemu-common.h | 31 ------------------------------- 1 file changed, 31 deletions(-) (limited to 'qemu-common.h') diff --git a/qemu-common.h b/qemu-common.h index 119d1bb326..2c955219da 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -62,37 +62,6 @@ static inline char *realpath(const char *path, char *resolved_path) #endif /* !defined(NEED_CPU_H) */ -#ifndef glue -#define xglue(x, y) x ## y -#define glue(x, y) xglue(x, y) -#define stringify(s) tostring(s) -#define tostring(s) #s -#endif - -#ifndef likely -#if __GNUC__ < 3 -#define __builtin_expect(x, n) (x) -#endif - -#define likely(x) __builtin_expect(!!(x), 1) -#define unlikely(x) __builtin_expect(!!(x), 0) -#endif - -#ifndef MIN -#define MIN(a, b) (((a) < (b)) ? (a) : (b)) -#endif -#ifndef MAX -#define MAX(a, b) (((a) > (b)) ? (a) : (b)) -#endif - -#ifndef always_inline -#if (__GNUC__ < 3) || defined(__APPLE__) -#define always_inline inline -#else -#define always_inline __attribute__ (( always_inline )) inline -#endif -#endif - /* bottom halves */ typedef struct QEMUBH QEMUBH; -- cgit v1.2.3