From 42da7da5efe76057b177ed9589947d7b1982435e Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Wed, 13 Jul 2022 12:46:36 -0600
Subject: [PATCH] Fix HB_NO_SHAPER HB_NO_OT_SHAPE build

---
 src/hb-shape-plan.cc | 2 +-
 src/hb-shaper.cc     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/hb-shape-plan.cc b/src/hb-shape-plan.cc
index f97aaed11..3e7173e62 100644
--- a/src/hb-shape-plan.cc
+++ b/src/hb-shape-plan.cc
@@ -117,7 +117,7 @@ hb_shape_plan_key_t::init (bool                           copy,
   }
   else
   {
-    const hb_shaper_entry_t *shapers = _hb_shapers_get ();
+    const HB_UNUSED hb_shaper_entry_t *shapers = _hb_shapers_get ();
     for (unsigned int i = 0; i < HB_SHAPERS_COUNT; i++)
       if (false)
 	;
diff --git a/src/hb-shaper.cc b/src/hb-shaper.cc
index da4253ed6..a900ac699 100644
--- a/src/hb-shaper.cc
+++ b/src/hb-shaper.cc
@@ -64,7 +64,7 @@ static struct hb_shapers_lazy_loader_t : hb_lazy_loader_t<hb_shaper_entry_t,
       if (!end)
 	end = p + strlen (p);
 
-      for (unsigned int j = i; j < ARRAY_LENGTH (_hb_all_shapers); j++)
+      for (unsigned int j = i; j < ARRAY_LENGTH_CONST (_hb_all_shapers); j++)
 	if (end - p == (int) strlen (shapers[j].name) &&
 	    0 == strncmp (shapers[j].name, p, end - p))
 	{