From patchwork Thu Nov 15 02:33:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151146 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453655ljp; Wed, 14 Nov 2018 18:34:38 -0800 (PST) X-Google-Smtp-Source: AJdET5fbcD/kq9VqMX5mUn5tGItW1+zw8UX+lK8xY+x7lefxHA9TcZNFFyy8UFr7q4fGlBDCtGiR X-Received: by 2002:a02:b697:: with SMTP id i23mr4081556jam.119.1542249278397; Wed, 14 Nov 2018 18:34:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249278; cv=none; d=google.com; s=arc-20160816; b=E4J5UG45iw2QWESEJyCpMzZ5jS2QUlR21T9YQdq1GKom9B7meLzVMkC00uchX70lx2 O24ymzXKln9D+++UkiwmAMPoTVbCFx9j5YIalRiO/gFPgs7ziuXtVoFVFfJOblvXFhIy uyFipenKKF/eIJcyjPQi1bW2x9M+slG27z08qX8xu6ZnvL8J8e9KAukcmPgK/9uG7eUN VWpJxVwykuzlYL4xtN5wS1ta55S9qumD7IsUFD9qD7WkZE71yUZWGdMxyv9nEOy7mgPv Tyb5RWtjyZsuzq8qXEm2x310cqR8dFdBZmILvNI9xL+ftX1d38q3ZmKCcm+zvh0oQBYF uwAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to; bh=n2vRkQjp63gyiTJVXR3K0bJiulqY+G9c8JYN1Fvjvss=; b=S24/w+7e4u6v8Pe+z3WzAkMS81bzkxcaz6iwtnCvdUenlhDOVt8cvH4/YcD0+6PmF1 AsGWENI9+TULRzwGcayaA8Ztt6YB9IUvgemzUcW0wEu4ut8dQ0wxvQdWsoiUWnZsnr3U vj0gFGWPiMoVaP+RjhsakKUQo9O0Es+Un+0TECNo3NWWRqpO4+dMGFmmD+JOBKPc77ea ahRUS332wjDPis1hpYLdxUVX0GPLTY2FXngAJoTbrbZXvqnVNFChZsV5s3gLtNhUAzLc NyhzcWG/3P5MrojwhvKVDitMGteXP4tENDB6ooDlDZXWku18zUXRoJe4H6RZiHHpLmvp TCDA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Kp/GH0Yt"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from ml01.01.org (ml01.01.org. [2001:19d0:306:5::1]) by mx.google.com with ESMTPS id q199-v6si14777238itc.144.2018.11.14.18.34.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:38 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) client-ip=2001:19d0:306:5::1; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b="Kp/GH0Yt"; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 2001:19d0:306:5::1 as permitted sender) smtp.mailfrom=edk2-devel-bounces@lists.01.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id A35B521191724; Wed, 14 Nov 2018 18:34:14 -0800 (PST) X-Original-To: edk2-devel@lists.01.org Delivered-To: edk2-devel@lists.01.org Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2607:f8b0:4864:20::442; helo=mail-pf1-x442.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pf1-x442.google.com (mail-pf1-x442.google.com [IPv6:2607:f8b0:4864:20::442]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 031A821191722 for ; Wed, 14 Nov 2018 18:34:13 -0800 (PST) Received: by mail-pf1-x442.google.com with SMTP id 64so4423668pfr.9 for ; Wed, 14 Nov 2018 18:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=KsEhS3ptJ5jiVnef+5MF6ImG/AsH5XIEwtJ6e65SX9c=; b=Kp/GH0Yt9fIIHjfewvnDP5tc2G1URiji79ZHtfomjZXnJcRO7yhPzHx8K9tZgI4Aq2 22F7ce9T2UCxeCq5ZMk5JuKsMnngY5hkGmEhe4vQwQedw0Me24arztHS1P9aItgFjsFe tJZ35fscgHVkG73PecGo+8Bk7QLV2TWpaBX+0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=KsEhS3ptJ5jiVnef+5MF6ImG/AsH5XIEwtJ6e65SX9c=; b=htOQxs6e8bmEoPRnaEpLs4mCUrJC0u5+Tr6tTi8JURp0BbSq5yr1EjGX51F4+DbwYB n8G2YiZbCwQglzO3TWfJWcl2tvRzFsCK/OjfU8ngI137rWZl14FRciOgGxr1T2rjakSC VLarSP3wyOoAuvRLdk5IJwxfdmw6q22Ao2oLInK+GFmhfFuHjb6mtZISQFeIjjszmBQc ZTd1L4sez1B2fwMsD4AkjfTQu6vWlJgFoUY7ipKl3hqdnMkAAgeX+ioejy6mls9pOZrp hS5h1lMPmPkQz7Tr+IvctfDv42O1xx+573MMbC2FcTdPaUxVo9a1fo4DlEQPrBQIc2gz JNtQ== X-Gm-Message-State: AGRZ1gIB6fwR2DUBhUbOYwrgaON1Q8HEmuVlCtMddYzvbHyeaos1U4+4 +3G2NxP2nwBgJyO1DAHLidYyfTWBihnoTw== X-Received: by 2002:a63:2d46:: with SMTP id t67mr4215538pgt.140.1542249252448; Wed, 14 Nov 2018 18:34:12 -0800 (PST) Received: from mba13.psav.com ([64.114.255.97]) by smtp.gmail.com with ESMTPSA id v185-v6sm27323393pfv.48.2018.11.14.18.34.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:11 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:42 -0800 Message-Id: <20181115023353.20159-10-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181115023353.20159-1-ard.biesheuvel@linaro.org> References: <20181115023353.20159-1-ard.biesheuvel@linaro.org> Subject: [edk2] [PATCH edk2-staging 09/20] IntelUndiPkg/XGigUndiDxe: fix incorrect use of CPP token pasting X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com MIME-Version: 1.0 Errors-To: edk2-devel-bounces@lists.01.org Sender: "edk2-devel" The ## CPP token pasting operator is used to paste *tokens*, which is not the same thing as pasting arbitrary macro arguments. Since a token cannot contain . or ) characters in the first place, using the ## operator here is wrong and unnecessary, so just remove it. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/NVDataStruc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel Reviewed-by: Ryszard Knop diff --git a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h index 63dd841277ab..c78d26da7869 100644 --- a/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h +++ b/IntelUndiPkg/XGigUndiDxe/NVDataStruc.h @@ -113,7 +113,7 @@ typedef struct { @return Width of given field is returned **/ -#define UNDI_CONFIG_WIDTH(Field) sizeof (UndiPrivateData->Configuration. ## Field ## ) +#define UNDI_CONFIG_WIDTH(Field) sizeof (UndiPrivateData->Configuration.Field) // General parameters #define QUESTION_ID_EFI_DRIVER_VER 0x1100