From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: None (no SPF record) identity=mailfrom; client-ip=134.134.136.126; helo=mga18.intel.com; envelope-from=ryszard.knop@linux.intel.com; receiver=edk2-devel@lists.01.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 681182117A287 for ; Tue, 29 Jan 2019 08:02:50 -0800 (PST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 29 Jan 2019 08:02:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.56,537,1539673200"; d="scan'208";a="118381958" Received: from linux.intel.com ([10.54.29.200]) by fmsmga007.fm.intel.com with ESMTP; 29 Jan 2019 08:02:49 -0800 Received: from torii (torii.igk.intel.com [10.102.24.20]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by linux.intel.com (Postfix) with ESMTPS id 06292580550; Tue, 29 Jan 2019 08:02:46 -0800 (PST) Message-ID: <485c3cd7206ee334b0842d932dddc20d288c83ce.camel@linux.intel.com> From: Ryszard Knop To: Ard Biesheuvel , edk2-devel@lists.01.org Cc: kamil.kacperski@intel.com, eric.jin@intel.com, pawel.orlowski@intel.com, michael.d.kinney@intel.com, harry.l.hsiung@intel.com Date: Tue, 29 Jan 2019 17:02:44 +0100 In-Reply-To: <20181106175833.26964-6-ard.biesheuvel@linaro.org> References: <20181106175833.26964-1-ard.biesheuvel@linaro.org> <20181106175833.26964-6-ard.biesheuvel@linaro.org> Organization: Intel Corporation User-Agent: Evolution 3.30.4 Mime-Version: 1.0 Subject: Re: [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, 29 Jan 2019 16:02:50 -0000 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 7bit Hmm, BRAND_STRUCT_S could be simplified into a single struct def - works on both MSVC and GCC. Reviewed-by: Ryszard Knop On Tue, 2018-11-06 at 18:58 +0100, ard.biesheuvela wrote: > 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)