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

diff --git a/host-utils.h b/host-utils.h
index 0f7744511082cf27177d3f57d1e262171feb57e5..b1e799ed3b1ab6e31e431c55c6b948552db0fabb 100644 (file)
--- 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 62de457048dedf01c582b2ab26d5c9611c01f786..a32242e07af92d3526b34285cd8f6b6bef42391e 100644 (file)
--- a/osdep.h
+++ b/osdep.h
@@ -35,9 +35,11 @@
 #define always_inline inline
 #else
 #define always_inline __attribute__ (( always_inline )) __inline__
+#define inline always_inline
 #endif
-#endif
+#else
 #define inline always_inline
+#endif
 
 #ifdef __i386__
 #define REGPARM __attribute((regparm(3)))