From cebdff772d6af6a65bf799cbbf68f86d97025495 Mon Sep 17 00:00:00 2001 From: ths Date: Thu, 5 Jun 2008 22:55:54 +0000 Subject: [PATCH] Fix always_inline definition for Darwin, by Andreas Faerber. git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@4674 c046a42c-6fe2-441c-8c8c-71466251a162 --- host-utils.h | 2 ++ osdep.h | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/host-utils.h b/host-utils.h index 0f77445110..b1e799ed3b 100644 --- a/host-utils.h +++ b/host-utils.h @@ -23,6 +23,8 @@ * THE SOFTWARE. */ +#include "osdep.h" + #if defined(__x86_64__) #define __HAVE_FAST_MULU64__ static always_inline void mulu64 (uint64_t *plow, uint64_t *phigh, diff --git a/osdep.h b/osdep.h index 62de457048..a32242e07a 100644 --- a/osdep.h +++ b/osdep.h @@ -35,9 +35,11 @@ #define always_inline inline #else #define always_inline __attribute__ (( always_inline )) __inline__ -#endif -#endif #define inline always_inline +#endif +#else +#define inline always_inline +#endif #ifdef __i386__ #define REGPARM __attribute((regparm(3)))