From patchwork Tue Nov 6 17:58:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 150313 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp4192403ljp; Tue, 6 Nov 2018 09:59:29 -0800 (PST) X-Google-Smtp-Source: AJdET5dVgbnFx2CqRuKEq1GO8h/oynCeV5DyabXo1ba6O1t5+El261t0vS6JQ9KSt5V3g4rO1Yfk X-Received: by 2002:a17:902:6bc9:: with SMTP id m9-v6mr27874403plt.106.1541527169789; Tue, 06 Nov 2018 09:59:29 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541527169; cv=none; d=google.com; s=arc-20160816; b=XTScrrZ9BsljEQoOyLxUHPWOjzU5lnpDhdy5vc1pXqBXQB7R7RbhCGreyVKTo2xSBi s6s8CqsXwBil5GmUwAHZGbwpa0ykmJaWTO0LjMvtwqosj82+Q8cMAVtc1lGxip+V8Hvl PgKXAviTN2h8ErGDui3SSFQvioTLOfAAyqgiZglvBUdX7y9L4j/IPSUpQ+rN33jFQafy NeIpBfvqTSBBYpUHvcjHC8GLVRy83tDkeLlGxoXjbqJcxGdoXwQ+RpVHqIP8bcPKdLWR PXDIy+A73jTLf/X+/XWEg10WuQZv2wWRafMLu99l/2TIi8Dba1h7EmORVAz4JcS/a9Pf HsdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=3dN1Zs9d1Jpx4EyuGdz91tu8hhz7iaF8zwHXYwMuDwc=; b=YWcK6QkI3K51FGcVm+TzVHY2m6bUhXcqWFrLu/6A931ZVp+bZTeDMLOAOysX3wxllp o9gFr0t1o2yoQctG/pZnGiF9eJHXr2Ij2slzp4i6MFT0pi6X3ifzkPpS8OgiwTs3ArEV uXLxeP09bGYDHx8r3Sg1UAx9Ep3pzYP7Y6lwcaHMeJba8TaKEQkwaIFNphwuyB0PXJIk QJ2XI6u89EloL26tiphBiQ6iMqjjM4lbq7CLzKXaP27Whhn9tAmz7iQWj4j3mOve9eAZ qjaHdZYIxWUQ5RYqrNnwGTYqhTDkW+gKlOsoyjRQZkunGyjYhVHo2pmAg0YuQudZaACw NGdw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=RNZKPiot; 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 i76-v6si6167634pfi.288.2018.11.06.09.59.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 09:59:29 -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=RNZKPiot; 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 6B9012118C50B; Tue, 6 Nov 2018 09:59:06 -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=2a00:1450:4864:20::344; helo=mail-wm1-x344.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm1-x344.google.com (mail-wm1-x344.google.com [IPv6:2a00:1450:4864:20::344]) (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 A5FEC21131DCF for ; Tue, 6 Nov 2018 09:59:05 -0800 (PST) Received: by mail-wm1-x344.google.com with SMTP id b203-v6so13102486wme.5 for ; Tue, 06 Nov 2018 09:59:05 -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 :mime-version:content-transfer-encoding; bh=w+e4mWTLa/0AxeelXA/FlAtta90qVZB3G6fo0JGI1q8=; b=RNZKPiotEB81TdqMinUliNEaeI75vyOBA29eZayeTZDeBFuT/nFuFG+GQ5slqYbf+r 4ou+ntfeEQpyLG3oEsnNkbhb7HrvmOveo7LV2Ok9FgviPk94D6L5d4RLS9lJPw60t4Ne +VqR5mJP8qtBCXSRKaPqHqaBQWrUNDKw1W/fY= 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:mime-version:content-transfer-encoding; bh=w+e4mWTLa/0AxeelXA/FlAtta90qVZB3G6fo0JGI1q8=; b=uGfDVFBk3TUdCAzn3qSiLFHSj1St7RYMh0X1Dq+7voqbcdWi1fGcvgDYrlBQKO2tob PJ72Enc+9/k226+/j9pQUdVvuUSxCLkpz8kdg+PuUQFuJRtJPJ4r0TcyV4TSYT/44VhM yfEHW/2u2RKtuG7Oq0VBiNNAQh8gfHK8Uf62+ck5cleATxNMxayK0JPrksYHC6jrVp2M Su9QDOslm0Kr4J8/aaw9ZAUrDxd7ztY3mP8zWitoHToPdiXCcrS7soAcZi02KAprmV7P ui2HHjebsFpjtsID2I7F+eQmpFx7dYwqDiHPwSIWYQKA+07bEMzNTrA4R3ALlV58IaWo O0Jw== X-Gm-Message-State: AGRZ1gI3OinyXWXtpEzPVWy86PkxeI6TWw4JK46XDRis62FjXJpRZuI3 a8Vn2Ib6Zndnw96UPeo5Fs9jwgqcePY= X-Received: by 2002:a1c:d181:: with SMTP id i123-v6mr2869449wmg.124.1541527143487; Tue, 06 Nov 2018 09:59:03 -0800 (PST) Received: from localhost.localdomain (laubervilliers-657-1-83-120.w92-154.abo.wanadoo.fr. [92.154.90.120]) by smtp.gmail.com with ESMTPSA id 134-v6sm2971522wmp.6.2018.11.06.09.59.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 09:59:02 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Tue, 6 Nov 2018 18:58:25 +0100 Message-Id: <20181106175833.26964-12-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181106175833.26964-1-ard.biesheuvel@linaro.org> References: <20181106175833.26964-1-ard.biesheuvel@linaro.org> MIME-Version: 1.0 Subject: [edk2] [PATCH edk2-staging 11/19] IntelUndiPkg/GigUndiDxe: 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: michael.d.kinney@intel.com, eric.jin@intel.com 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/GigUndiDxe/NVDataStruc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.19.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/GigUndiDxe/NVDataStruc.h b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h index 72f6a95ccb6d..04f08b41c842 100644 --- a/IntelUndiPkg/GigUndiDxe/NVDataStruc.h +++ b/IntelUndiPkg/GigUndiDxe/NVDataStruc.h @@ -112,7 +112,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