From: Blue Swirl <blauwirbel@gmail.com>
Date: Sun, 8 Jul 2012 07:00:50 +0000 (+0000)
Subject: Avoid redefining inline
X-Git-Tag: v1.2.0-rc0~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b595c14a7bd3d4d47a44d064d7efbaaf45b4321b;p=thirdparty%2Fqemu.git

Avoid redefining inline

System headers (e.g. gutils.h) may define 'inline', #undefine it
before #defining.

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---

diff --git a/osdep.h b/osdep.h
index 3ea4af099ba..1e15a4b91cd 100644
--- a/osdep.h
+++ b/osdep.h
@@ -70,10 +70,12 @@ typedef signed int              int_fast16_t;
 #ifndef always_inline
 #if !((__GNUC__ < 3) || defined(__APPLE__))
 #ifdef __OPTIMIZE__
+#undef inline
 #define inline __attribute__ (( always_inline )) __inline__
 #endif
 #endif
 #else
+#undef inline
 #define inline always_inline
 #endif