From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:53707) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvpqq-0002ju-Of for qemu-devel@nongnu.org; Fri, 10 Feb 2012 07:45:25 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Rvpql-0006ki-GA for qemu-devel@nongnu.org; Fri, 10 Feb 2012 07:45:20 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48840) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Rvpql-0006jx-4t for qemu-devel@nongnu.org; Fri, 10 Feb 2012 07:45:15 -0500 From: Kevin Wolf Date: Fri, 10 Feb 2012 13:47:41 +0100 Message-Id: <1328878064-4907-13-git-send-email-kwolf@redhat.com> In-Reply-To: <1328878064-4907-1-git-send-email-kwolf@redhat.com> References: <1328878064-4907-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 12/15] rewrite QEMU_BUILD_BUG_ON List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Dong Xu Wang On some platforms, __LINE__ will not expand to real number in QEMU_BUILD_BUG_ON, so if using QEMU_BUILD_BUG_ON twice, compiler will report errors. This patch will fix it. BTW, I got error message on RHEL 6.1/gcc 4.4.5. Signed-off-by: Dong Xu Wang Signed-off-by: Kevin Wolf --- compiler.h | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/compiler.h b/compiler.h index a1c0794..736e770 100644 --- a/compiler.h +++ b/compiler.h @@ -30,8 +30,10 @@ # define QEMU_PACKED __attribute__((packed)) #endif +#define cat(x,y) x ## y +#define cat2(x,y) cat(x,y) #define QEMU_BUILD_BUG_ON(x) \ - typedef char qemu_build_bug_on__##__LINE__[(x)?-1:1]; + typedef char cat2(qemu_build_bug_on__,__LINE__)[(x)?-1:1]; #if defined __GNUC__ # if !QEMU_GNUC_PREREQ(4, 4) -- 1.7.6.5