From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:4864:20::441; helo=mail-wr1-x441.google.com; envelope-from=ard.biesheuvel@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wr1-x441.google.com (mail-wr1-x441.google.com [IPv6:2a00:1450:4864:20::441]) (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 8414D2118C4FA for ; Tue, 6 Nov 2018 09:58:57 -0800 (PST) Received: by mail-wr1-x441.google.com with SMTP id u9-v6so4227628wrr.0 for ; Tue, 06 Nov 2018 09:58:57 -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=LKCg71hc67qbpgYH56ba3TJFCRV9OF6rKrar8mNKZd0=; b=BxTVKxNi4UVeARkxRPZiP3osaONmIs9oRDqbxsAgkkVC4w8ac1hCSo+w1NaJLUWI1I poD08GJ/9Uo4Yxoqab4rC2RUYRKaePneUeYx1pYQBNl2cC0oIECCJAXZqur0d4ld3Dla hcHOmK1kcyXjP9ECNswCc2c14GJJbT89XbXwY= 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=LKCg71hc67qbpgYH56ba3TJFCRV9OF6rKrar8mNKZd0=; b=pKDd3saAu10QsCheJC74TvURhFiAlRh0L2LXqDtUTvHXyI8zVk+gUWu43vlpEl/4Oh N0vYqKUwBiAosuvlnue+iVHf075vIloMpBl+cJ51XjI9L4SbqXRd3mWh8U4t077iptR4 1fFyZ+Q4VQRybcgVLIUZ4fPCA2wog8QgnSJMGKW2gmcNooUcpjeaKG3d4C6GVldTWQ/w w0iV0dv+rwXzVya6nWdRQIBOy9m2QL5h5Z/qHRzIt2oGQiItP6VcdLE2+OpMsve1CaO4 H8F4LgLevvGmxKMASOjKyfoQGI/dXl83xkkO69jZ1CYEu6lYNHD/hG9Jh7ipN1FalQu7 C5MQ== X-Gm-Message-State: AGRZ1gKajCh6fabl0mCTKgt14ud+b/BZ8J6EIOJe0mH/mPOT1Jooi/V5 bH32IVVHxRF/5qO6OLUaYNhS6UsT5zo= X-Google-Smtp-Source: AJdET5dh/ZDoiFHi4rKRalCvixK7qicKwpWwXnV5/MhyGkYd2PO9fWdk09mVu3u9rt4hKKPajILnVQ== X-Received: by 2002:adf:f941:: with SMTP id q1-v6mr23649264wrr.151.1541527135781; Tue, 06 Nov 2018 09:58:55 -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.58.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 06 Nov 2018 09:58:54 -0800 (PST) From: Ard Biesheuvel To: edk2-devel@lists.01.org Cc: maciej.rabeda@intel.com, michael.d.kinney@intel.com, eric.jin@intel.com, leif.lindholm@linaro.org, Ard Biesheuvel Date: Tue, 6 Nov 2018 18:58:19 +0100 Message-Id: <20181106175833.26964-6-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: [PATCH edk2-staging 05/19] IntelUndiPkg/GigUndiDxe: 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: Tue, 06 Nov 2018 17:58:57 -0000 Content-Transfer-Encoding: 8bit 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/GigUndiDxe/DeviceSupport.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/IntelUndiPkg/GigUndiDxe/DeviceSupport.h b/IntelUndiPkg/GigUndiDxe/DeviceSupport.h index e156b587f6a7..e2b730131f8e 100644 --- a/IntelUndiPkg/GigUndiDxe/DeviceSupport.h +++ b/IntelUndiPkg/GigUndiDxe/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.19.1