From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Fri, 18 Dec 2015 11:46:13 +0000 (+0000)
Subject: Avoid __always_inline conflicting with cdef.h
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=fb4d14985fb9ad7fe81a0f7c87ddab83cd1c7a46;p=people%2Froyger%2Fxen-test-framework.git

Avoid __always_inline conflicting with cdef.h

Fixes build issues with the build-time selftests.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/include/xtf/compiler.h b/include/xtf/compiler.h
index 297f636..47d929c 100644
--- a/include/xtf/compiler.h
+++ b/include/xtf/compiler.h
@@ -5,7 +5,10 @@
 #define __packed              __attribute__((__packed__))
 
 #define __noinline            __attribute__((__noinline__))
+
+#ifndef __always_inline /* Avoid conflicting with cdefs.h */
 #define __always_inline       __attribute__((__always_inline__))
+#endif
 
 #define __noreturn            __attribute__((__noreturn__))
 #define unreachable()         __builtin_unreachable()