From patchwork Thu Nov 15 02:33:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 151141 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp6453430ljp; Wed, 14 Nov 2018 18:34:18 -0800 (PST) X-Google-Smtp-Source: AJdET5cjKNV4VOnhGbTGXsSGN6rycwvrXu1TnB73bxVb5T1HTJ3ooNbcf3cIeGZuC1lz9ZdBE6rh X-Received: by 2002:a63:c141:: with SMTP id p1mr4113633pgi.424.1542249257931; Wed, 14 Nov 2018 18:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542249257; cv=none; d=google.com; s=arc-20160816; b=G/AC+Cd831UlSK3OVdo89oTaBWnD7HAX5uV6BK9wn9ja6hlJl77f3/m1Idk3o7r4Hu jg2zhsQI2rvkfedjkZ2NgaGiLAzO7jYGaODCNyOOxxUQKjEdiHmsPttHZMUPPTQ2aTfG /e+ZpudRdtdZWr6Loi9TOB3wA7zegI1to9YxbL6cy+kK+9Gj4wt7ROYz2Od49hp9orK5 fXV4QxjDQCHwotmCGKx/rFhx0uu1F6H+AKoEDrRD+ic1ZwfvOvvtr5H4nbReeswwEYYk 31obFnWUnKThf8CndfVYbi1zMRhwxwgt6/DM5D/sw2fZ+YURWWHnYCgxoUR6spOuAOh9 Mh9g== 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=XeMeMJ2sf0j7/+EML//Ey/Vx3ADt8afR+xZ1MfxkrBE=; b=LsSXtTsIvDTYtO1nqjdG9QlEC18cgkZSGdnFMOsWUTxphpGz8gtX/c4eqq47u59sdQ y8eVkzOJA9IaT0VjFQONlRJ6u26CNDHf6Cf+p+dzPoMZ6RGTNMbQ6P0OO/5et+MZ194Y zsIS4l1HK6c8Ey/5LOk5k4s7MnjuyNA5LxAKf4IngKlN1v+4ZwZeol6xLMznfdt8uFrB tqR3tv0RvLzZTLPs6YmuVWnsAoMaRyB7vReU6dN1KgamzHvKBnT1TjaJfqUkSEPFRzXR EKyIHfu+TVlKPimMmyWmhioZhQcPV3NOGc6e9NM41tYzrW7bgV8LkGWbDYcrcOWEYfF0 MeYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NEc1G7Xt; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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. [198.145.21.10]) by mx.google.com with ESMTPS id d32-v6si27948833pla.405.2018.11.14.18.34.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:17 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 as permitted sender) client-ip=198.145.21.10; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=NEc1G7Xt; spf=pass (google.com: best guess record for domain of edk2-devel-bounces@lists.01.org designates 198.145.21.10 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 98F452119073B; Wed, 14 Nov 2018 18:34:08 -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::642; helo=mail-pl1-x642.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) (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 EC08B2119072C for ; Wed, 14 Nov 2018 18:34:06 -0800 (PST) Received: by mail-pl1-x642.google.com with SMTP id b5so2304980plr.4 for ; Wed, 14 Nov 2018 18:34:06 -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=7dBM7o6UpUKQrjVbhkgK3XyND2ELVb39psmGynYj9vA=; b=NEc1G7Xt2S49ib2FeCZIvy73KEzt7u5B2cVH7tiX+rxqFnLVDoWrs5M/lj6ayFJZSQ to6xaEFIZdl1rVrR3ew0PBUPu54r2+sXlVTXnlNGaM5BC/KMVx2QYZimo7bRpivv0tIL MhEkYwdB9PtUsg82UbrdETYwwQDISXeFiBhHU= 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=7dBM7o6UpUKQrjVbhkgK3XyND2ELVb39psmGynYj9vA=; b=HLljkKMod6f5QsDSgcji/kX9EvKFsBZsBVlZgUWOuP/NqAACyapn7/V9+cQLkC0njt LXpRonYwiOm9qRXow9Z5ShDeziQRIK4b1c7KrtIeZa4pw272eHCPYqM2IWlpVaEplrAf yCTzvtbNfO4ojLnDmeEY3b8TR+q2qTjvxHqJMZ517m0lfsc5QK9OyG2sgiEb5akyT90v hBToL4s/ZYjwPmJ07WFjTDAE4i9xjptUQgoUmHr1vbN6+TTs8hjAhPuJ5dVvY17biQwA wV0ZkM80TqIyiHHMleeAcbc9bzqiMNJuFHm/NRJSVBSScSq5gUMjCtVqg2MFeqhVOdZQ HRRA== X-Gm-Message-State: AGRZ1gLQ+CUq9S1sxHoX+bWGp45E1sUmTeAVeH33Oi2+mxSctHOl0Apg Enub88vMN5UR9AP9Vh/vvbAuHNoS5HHIoQ== X-Received: by 2002:a17:902:bd0b:: with SMTP id p11-v6mr4410356pls.35.1542249246474; Wed, 14 Nov 2018 18:34:06 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Nov 2018 18:34:05 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Date: Wed, 14 Nov 2018 18:33:37 -0800 Message-Id: <20181115023353.20159-5-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 04/20] IntelUndiPkg/XGigUndiDxe: move BRAND_STRUCT declaration after type definition 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" Move the extern declaration of mBrandingTable[] after the definition of the type. This solves a build issue with GCC. Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Ard Biesheuvel --- IntelUndiPkg/XGigUndiDxe/DeviceSupport.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 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/DeviceSupport.h b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h index e997983ba3e7..d501d9bb1371 100644 --- a/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h +++ b/IntelUndiPkg/XGigUndiDxe/DeviceSupport.h @@ -33,9 +33,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. typedef struct BRAND_STRUCT_S BRAND_STRUCT; -extern BRAND_STRUCT mBrandingTable[]; -extern UINTN mBrandingTableSize; - /* Defines */ #define INVALID_VENDOR_ID 0xFFFF #define INVALID_SUBVENDOR_ID 0xFFFF @@ -53,6 +50,9 @@ struct BRAND_STRUCT_S { CHAR16 *BrandString; }; +extern BRAND_STRUCT mBrandingTable[]; +extern UINTN mBrandingTableSize; + /* Function declarations */ /** Returns pointer to current device's branding string (looks for best match)