From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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-Google-Smtp-Source: AJdET5cdn9JdwaYtQcPSTH8gPxLozveyCpXybQ5pgsy3SSTGbrIBVU4NYW81ENScw2nmT7jPwynKBw== 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 Cc: leif.lindholm@linaro.org, maciej.rabeda@intel.com, kamil.kacperski@intel.com, pawel.orlowski@intel.com, philmd@redhat.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com, eric.jin@intel.com, Ard Biesheuvel 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: [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: , X-List-Received-Date: Thu, 15 Nov 2018 02:34:07 -0000 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(-) 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) -- 2.17.1