From patchwork Wed Jul 22 16:44:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 51367 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by patches.linaro.org (Postfix) with ESMTPS id 41184228EF for ; Wed, 22 Jul 2015 16:44:27 +0000 (UTC) Received: by lbcjj5 with SMTP id jj5sf25161077lbc.1 for ; Wed, 22 Jul 2015 09:44:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=mr1mj85XAlBBtLidBPF3Xg2uOhaMI9pd7RC/UoXzwPY=; b=f7cebOGGAVqV5xyA7hXmJBFsA59RNo+bbpNjzxlSXehheTjMW82gzvw04qOQL/67gh kb8Yy0xfclWPNm4VrdgpKux9Mxxl5V5vNoE4kUCxOCWNGfCHvw2Q2bnGPeqnizyXxhcE zogM0HWbiBv+zdU5EzHcy+cro/oWZeI2VpMocOLOnQhRTvK8rwNbD81CUrfLdtBn84C6 JB6ZPAhIz/5LlXNaRO2XQrX9o0P4Jty9nFtPHfcGJUf07+WotFo6V3j8xmghBygHqg1b nr/Ww6ewh9LOzlaf1MXDAsIjcfICjpQ2KJ37jPR7AVqiaLF0EDrCPtNgb78Pg7NcFQMS NmGA== X-Gm-Message-State: ALoCoQlqkMDG8h75POk3fQeNfZ97ECTzl21Lt1B8XZU8gogaOSsr2BEJPraex/mti+KCALJPdxeO X-Received: by 10.152.237.36 with SMTP id uz4mr1592937lac.1.1437583466309; Wed, 22 Jul 2015 09:44:26 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.4 with SMTP id x4ls122492lag.100.gmail; Wed, 22 Jul 2015 09:44:26 -0700 (PDT) X-Received: by 10.112.190.10 with SMTP id gm10mr3213588lbc.2.1437583466167; Wed, 22 Jul 2015 09:44:26 -0700 (PDT) Received: from mail-la0-f41.google.com (mail-la0-f41.google.com. [209.85.215.41]) by mx.google.com with ESMTPS id yo1si1624669lbb.167.2015.07.22.09.44.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Jul 2015 09:44:25 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) client-ip=209.85.215.41; Received: by lahh5 with SMTP id h5so141636167lah.2 for ; Wed, 22 Jul 2015 09:44:25 -0700 (PDT) X-Received: by 10.112.126.101 with SMTP id mx5mr3306012lbb.35.1437583465748; Wed, 22 Jul 2015 09:44:25 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp46271lba; Wed, 22 Jul 2015 09:44:24 -0700 (PDT) X-Received: by 10.202.213.21 with SMTP id m21mr3531532oig.26.1437583458311; Wed, 22 Jul 2015 09:44:18 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fs16si5143093pac.15.2015.07.22.09.44.16 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 22 Jul 2015 09:44:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZHx7r-0002Wn-Jm; Wed, 22 Jul 2015 17:44:11 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 04/12] compiler.h: Use glue() in QEMU_BUILD_BUG_ON define Date: Wed, 22 Jul 2015 17:44:03 +0100 Message-Id: <1437583451-9677-5-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> References: <1437583451-9677-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.41 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Rather than rolling custom concatenate-strings macros for the QEMU_BUILD_BUG_ON macro to use, use the glue() macro we already have (since it's now available to us in this header). Signed-off-by: Peter Maydell --- include/qemu/compiler.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index bdc9a60..d22eb01 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -89,10 +89,8 @@ #define inline always_inline #endif -#define cat(x,y) x ## y -#define cat2(x,y) cat(x,y) #define QEMU_BUILD_BUG_ON(x) \ - typedef char cat2(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused)); + typedef char glue(qemu_build_bug_on__,__LINE__)[(x)?-1:1] __attribute__((unused)); #if defined __GNUC__ # if !QEMU_GNUC_PREREQ(4, 4)