NetworkPkg/IpsecConfig: guard the definition of ARRAY_SIZE

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).

Cc: Jiaxin Wu <jiaxin.wu@intel.com>
Cc: Siyuan Fu <siyuan.fu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Fu Siyuan <siyuan.fu@intel.com>
Reviewed-by: Wu Jiaxin <jiaxin.wu@intel.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
index 8ebc599a12e7210f8316794dd13e3293e63ed92a..79a436a7b3b2a18e68a9cf717c9645db5a326af1 100644 (file)
--- a/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
+++ b/NetworkPkg/Application/IpsecConfig/IpSecConfig.h
@@ -27,7 +27,9 @@
 \r
 #include <Protocol/IpSecConfig.h>\r
 \r
 \r
 #include <Protocol/IpSecConfig.h>\r
 \r

+#ifndef ARRAY_SIZE\r

 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))\r
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))\r

+#endif\r

 \r
 #define IPSECCONFIG_STATUS_NAME    L"IpSecStatus"\r
 \r
 \r
 #define IPSECCONFIG_STATUS_NAME    L"IpSecStatus"\r
 \r