From 93bdf9b2dfe18af0f1aa93b890f0be260f31d90e Mon Sep 17 00:00:00 2001
From: Ebrahim Byagowi <ebrahim@gnu.org>
Date: Wed, 9 May 2018 23:24:17 +0430
Subject: [PATCH] Use arrayZ on hb-coretext and hb-uniscribe and fix macOS/Win
 bots (#1024)

Following to 63f57f4
---
 src/hb-coretext.cc  |  2 +-
 src/hb-uniscribe.cc | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc
index 837b3fb7e..3924c8ebf 100644
--- a/src/hb-coretext.cc
+++ b/src/hb-coretext.cc
@@ -777,7 +777,7 @@ _hb_coretext_shape (hb_shape_plan_t    *shape_plan,
       } else {
         active_feature_t *feature = active_features.find (&event->feature);
 	if (feature)
-	  active_features.remove (feature - active_features.array);
+	  active_features.remove (feature - active_features.arrayZ);
       }
     }
   }
diff --git a/src/hb-uniscribe.cc b/src/hb-uniscribe.cc
index bc6667c39..3cd419e88 100644
--- a/src/hb-uniscribe.cc
+++ b/src/hb-uniscribe.cc
@@ -726,7 +726,7 @@ _hb_uniscribe_shape (hb_shape_plan_t    *shape_plan,
       } else {
         active_feature_t *feature = active_features.find (&event->feature);
 	if (feature)
-	  active_features.remove (feature - active_features.array);
+	  active_features.remove (feature - active_features.arrayZ);
       }
     }
 
@@ -737,7 +737,7 @@ _hb_uniscribe_shape (hb_shape_plan_t    *shape_plan,
     for (unsigned int i = 0; i < range_records.len; i++)
     {
       range_record_t *range = &range_records[i];
-      range->props.potfRecords = feature_records.array + reinterpret_cast<uintptr_t> (range->props.potfRecords);
+      range->props.potfRecords = feature_records.arrayZ + reinterpret_cast<uintptr_t> (range->props.potfRecords);
     }
   }
   else
@@ -916,8 +916,8 @@ retry:
 				     &items[i].a,
 				     script_tags[i],
 				     language_tag,
-				     range_char_counts.array,
-				     range_properties.array,
+				     range_char_counts.arrayZ,
+				     range_properties.arrayZ,
 				     range_properties.len,
 				     pchars + chars_offset,
 				     item_chars_len,
@@ -957,8 +957,8 @@ retry:
 				     &items[i].a,
 				     script_tags[i],
 				     language_tag,
-				     range_char_counts.array,
-				     range_properties.array,
+				     range_char_counts.arrayZ,
+				     range_properties.arrayZ,
 				     range_properties.len,
 				     pchars + chars_offset,
 				     log_clusters + chars_offset,