From 7b5f0dd3a8b4a126b7952fea1c4c30b8b456083e Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Thu, 12 Jan 2023 15:05:19 -0700
Subject: [PATCH] Move hb-ot-name-language-static.hh out of hb-static.cc

Since hb-static.cc is used by libharfbuzz-cairo as well.
---
 src/hb-ot-name.cc | 2 ++
 src/hb-static.cc  | 1 -
 src/hb-subset.cc  | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/hb-ot-name.cc b/src/hb-ot-name.cc
index 6adf1e8fb..0323364ae 100644
--- a/src/hb-ot-name.cc
+++ b/src/hb-ot-name.cc
@@ -181,4 +181,6 @@ hb_ot_name_get_utf32 (hb_face_t       *face,
   return hb_ot_name_get_utf<hb_utf32_t> (face, name_id, language, text_size, text);
 }
 
+#include "hb-ot-name-language-static.hh"
+
 #endif
diff --git a/src/hb-static.cc b/src/hb-static.cc
index d52a4f11d..06036116a 100644
--- a/src/hb-static.cc
+++ b/src/hb-static.cc
@@ -39,7 +39,6 @@
 #include "hb-ot-maxp-table.hh"
 
 #ifndef HB_NO_VISIBILITY
-#include "hb-ot-name-language-static.hh"
 
 uint64_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)] = {};
 /*thread_local*/ uint64_t _hb_CrapPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)] = {};
diff --git a/src/hb-subset.cc b/src/hb-subset.cc
index d3dc2f62a..9b5b73cec 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -625,3 +625,8 @@ hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan)
 end:
   return success ? hb_face_reference (plan->dest) : nullptr;
 }
+
+#ifndef HB_NO_VISIBILITY
+/* If NO_VISIBILITY, libharfbuzz has this. */
+#include "hb-ot-name-language-static.hh"
+#endif