]> xenbits.xensource.com Git - people/royger/xen-test-framework.git/commitdiff
Avoid __always_inline conflicting with cdef.h
authorAndrew Cooper <andrew.cooper3@citrix.com>
Fri, 18 Dec 2015 11:46:13 +0000 (11:46 +0000)
committerAndrew Cooper <andrew.cooper3@citrix.com>
Mon, 21 Dec 2015 11:32:29 +0000 (11:32 +0000)
Fixes build issues with the build-time selftests.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
include/xtf/compiler.h

index 297f636714d1ec60c010f94a131b7c28bbb0373f..47d929ca3368ec7b26ea2292648770e0ff432e40 100644 (file)
@@ -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()