commit a5dac1a35ba2876451dfee769830dff7e587c692
author Elliott Hughes <enh@google.com> Tue Jun 28 21:59:33 2016 -0700
committer Elliott Hughes <enh@google.com> Tue Jun 28 21:59:33 2016 -0700
tree 7c3de34a2d67e60ede0c550d621d9784e7370426
parent 37ac5e3fdae9fa33d669b5182741b07abca52a59

Fix build breakage from merge conflict resolution.

Change-Id: Icb623ebfb53a366cdd56674e87fa0781683e144e

fastboot/fastboot.cpp

diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp
index 9cb61c3..3ae7408 100644
--- a/fastboot/fastboot.cpp
+++ b/fastboot/fastboot.cpp
@@ -1090,7 +1090,7 @@
 
     setup_requirements(reinterpret_cast<char*>(data), sz);
 
-    for (size_t i = 0; i < ARRAY_SIZE(images); i++) {
+    for (size_t i = 0; i < arraysize(images); i++) {
         fname = find_item(images[i].part_name, product);
         fastboot_buffer buf;
         if (!load_buf(transport, fname.c_str(), &buf)) {