From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH] xen/common: Uniformally use __ varients for attribute names Date: Thu, 11 Feb 2016 19:51:42 +0000 Message-ID: <1455220302-32685-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Andrew Cooper , Tim Deegan , Ian Campbell , Jan Beulich List-Id: xen-devel@lists.xenproject.org Otherwise, debug code such as "void __attribute__((noreturn)) foobar()" fails to compile when the noreturn itself gets expanded, resulting in __attribute__((__attribute__((noreturn)))). No function change. Signed-off-by: Andrew Cooper --- CC: Jan Beulich CC: Tim Deegan CC: Ian Campbell --- xen/include/xen/compiler.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xen/include/xen/compiler.h b/xen/include/xen/compiler.h index 4b3472d..892455b 100644 --- a/xen/include/xen/compiler.h +++ b/xen/include/xen/compiler.h @@ -11,12 +11,12 @@ #define unlikely(x) __builtin_expect(!!(x),0) #define inline __inline__ -#define always_inline __inline__ __attribute__ ((always_inline)) -#define noinline __attribute__((noinline)) +#define always_inline __inline__ __attribute__ ((__always_inline__)) +#define noinline __attribute__((__noinline__)) -#define noreturn __attribute__((noreturn)) +#define noreturn __attribute__((__noreturn__)) -#define __packed __attribute__((packed)) +#define __packed __attribute__((__packed__)) #if (!defined(__clang__) && (__GNUC__ == 4) && (__GNUC_MINOR__ < 5)) #define unreachable() do {} while (1) @@ -43,7 +43,7 @@ #define __inline__ __inline__ __init #endif -#define __attribute_pure__ __attribute__((pure)) +#define __attribute_pure__ __attribute__((__pure__)) #define __attribute_const__ __attribute__((__const__)) /* @@ -60,7 +60,7 @@ #define __used __attribute__((__used__)) #define __maybe_unused __attribute__((__unused__)) -#define __must_check __attribute__((warn_unused_result)) +#define __must_check __attribute__((__warn_unused_result__)) #define offsetof(a,b) __builtin_offsetof(a,b) -- 2.1.4