summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-05 22:55:54 +0000
committerths <ths@c046a42c-6fe2-441c-8c8c-71466251a162>2008-06-05 22:55:54 +0000
commitcebdff772d6af6a65bf799cbbf68f86d97025495 (patch)
tree89ce7eea8483a94ac300c6d59171dc27f12cad2a
parentRemove dead-code (else-block) from block-qcow.c, by Marc Bevand. (diff)
downloadqemu-kvm-cebdff772d6af6a65bf799cbbf68f86d97025495.tar.gz
qemu-kvm-cebdff772d6af6a65bf799cbbf68f86d97025495.tar.bz2
qemu-kvm-cebdff772d6af6a65bf799cbbf68f86d97025495.zip
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
-rw-r--r--host-utils.h2
-rw-r--r--osdep.h4
2 files changed, 5 insertions, 1 deletions
diff --git a/host-utils.h b/host-utils.h
index 0f7744511..b1e799ed3 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 62de45704..a32242e07 100644
--- 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)))