From: Roger Pau Monne <roger.pau@citrix.com>
Date: Fri, 6 May 2016 09:15:49 +0000 (+0200)
Subject: xtf: don't re-define __noinline
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6fb84918d3da80fd280357091072b643ec93c155;p=people%2Froyger%2Fxen-test-framework.git

xtf: don't re-define __noinline

On FreeBSD __noinline is already defined in cdefs.h

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
---
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/include/xtf/compiler.h b/include/xtf/compiler.h
index 47d929c..251b853 100644
--- a/include/xtf/compiler.h
+++ b/include/xtf/compiler.h
@@ -4,7 +4,9 @@
 #define __aligned(x)          __attribute__((__aligned__(x)))
 #define __packed              __attribute__((__packed__))
 
+#ifndef __noinline /* Avoid conflicting with cdefs.h */
 #define __noinline            __attribute__((__noinline__))
+#endif
 
 #ifndef __always_inline /* Avoid conflicting with cdefs.h */
 #define __always_inline       __attribute__((__always_inline__))