From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) (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 5DBFE1A1E43 for ; Wed, 26 Oct 2016 18:59:34 -0700 (PDT) Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga105.fm.intel.com with ESMTP; 26 Oct 2016 18:59:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,404,1473145200"; d="scan'208";a="24116010" Received: from fmsmsx104.amr.corp.intel.com ([10.18.124.202]) by fmsmga006.fm.intel.com with ESMTP; 26 Oct 2016 18:59:34 -0700 Received: from fmsmsx151.amr.corp.intel.com (10.18.125.4) by fmsmsx104.amr.corp.intel.com (10.18.124.202) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 26 Oct 2016 18:59:33 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX151.amr.corp.intel.com (10.18.125.4) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 26 Oct 2016 18:59:33 -0700 Received: from shsmsx102.ccr.corp.intel.com ([169.254.2.206]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.96]) with mapi id 14.03.0248.002; Thu, 27 Oct 2016 09:59:30 +0800 From: "Fu, Siyuan" To: Laszlo Ersek , edk2-devel-01 CC: "Wu, Jiaxin" Thread-Topic: [PATCH 02/47] NetworkPkg/IpsecConfig: guard the definition of ARRAY_SIZE Thread-Index: AQHSL7vsxbRsgkQ1rUOstOkqXLc/c6C7i/yw Date: Thu, 27 Oct 2016 01:59:29 +0000 Message-ID: References: <20161026190504.9888-1-lersek@redhat.com> <20161026190504.9888-3-lersek@redhat.com> In-Reply-To: <20161026190504.9888-3-lersek@redhat.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_IC x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZmI1Y2JkMTMtMGU0Yi00MjZiLWI4ZDQtYjk4MjZmMDM3MmQ0IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX0lDIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE1LjkuNi42IiwiVHJ1c3RlZExhYmVsSGFzaCI6InNzVGdHQmN6cldVSzFvQklhMjNPWHZQdzVZZnZyNVlGRDdFOHdaUkl4SXc9In0= x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [PATCH 02/47] NetworkPkg/IpsecConfig: guard the definition of ARRAY_SIZE X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 27 Oct 2016 01:59:34 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Fu Siyuan siyuan.fu@intel.com > -----Original Message----- > From: Laszlo Ersek [mailto:lersek@redhat.com] > Sent: Thursday, October 27, 2016 3:04 AM > To: edk2-devel-01 > Cc: Wu, Jiaxin ; Fu, Siyuan > Subject: [PATCH 02/47] NetworkPkg/IpsecConfig: guard the definition of > ARRAY_SIZE >=20 > In one of the next patches, we'll introduce ARRAY_SIZE in > "MdePkg/Include/Base.h". In order to proceed in small steps, make the > module-local definition of ARRAY_SIZE conditional. This way the > introduction of the macro under MdePkg will silently switch this module > over (after which we can remove the module-local definition completely). >=20 > Cc: Jiaxin Wu > Cc: Siyuan Fu > Contributed-under: TianoCore Contribution Agreement 1.0 > Signed-off-by: Laszlo Ersek > --- > NetworkPkg/Application/IpsecConfig/IpSecConfig.h | 2 ++ > 1 file changed, 2 insertions(+) >=20 > diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > index 8ebc599a12e7..79a436a7b3b2 100644 > --- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > +++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h > @@ -27,7 +27,9 @@ >=20 > #include >=20 > +#ifndef ARRAY_SIZE > #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) > +#endif >=20 > #define IPSECCONFIG_STATUS_NAME L"IpSecStatus" >=20 > -- > 2.9.2 >=20