aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2012-07-08 07:00:50 +0000
committerBlue Swirl <blauwirbel@gmail.com>2012-07-28 09:23:20 +0000
commitb595c14a7bd3d4d47a44d064d7efbaaf45b4321b (patch)
tree674358b433a22c611fcb37fb4c52438b9bdc3e97
parent0ed8b6f67f26acc2e88dfc6be4954e63f943bd28 (diff)
downloadqemu-arm-b595c14a7bd3d4d47a44d064d7efbaaf45b4321b.tar.gz
Avoid redefining inline
System headers (e.g. gutils.h) may define 'inline', #undefine it before #defining. Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--osdep.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/osdep.h b/osdep.h
index 3ea4af099b..1e15a4b91c 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