OvmfPkg/PlatformBootManagerLib: 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: Jordan Justen <jordan.l.justen@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>

diff --git a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
index 29ce21282595acc8e38a82f6f12fc75661e437cc..16618a8f57f08636ba62ce5f68cbb8d0d8219092 100644 (file)
--- a/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
+++ b/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c
@@ -40,7 +40,9 @@ CONST UINT8 PciHostIrqs[] = {
 //\r
 // Array Size macro\r
 //\r
+#ifndef ARRAY_SIZE\r
 #define ARRAY_SIZE(array) (sizeof (array) / sizeof (array[0]))\r
+#endif\r
 \r
 //\r
 // Type definitions\r