From 4129061e37824433f9c81eaa99d1618af2f2d69a Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Mon, 24 Apr 2023 13:04:05 -0600
Subject: [PATCH] Revert "Move hb-ot-name-language-static.hh out of
 hb-static.cc"

This reverts commit 7b5f0dd3a8b4a126b7952fea1c4c30b8b456083e.

Fixes https://github.com/harfbuzz/harfbuzz/issues/4203
---
 src/hb-ot-name.cc | 2 --
 src/hb-static.cc  | 1 +
 src/hb-subset.cc  | 5 -----
 3 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/hb-ot-name.cc b/src/hb-ot-name.cc
index 0323364ae..6adf1e8fb 100644
--- a/src/hb-ot-name.cc
+++ b/src/hb-ot-name.cc
@@ -181,6 +181,4 @@ 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 31acc0172..a1a2522ed 100644
--- a/src/hb-static.cc
+++ b/src/hb-static.cc
@@ -40,6 +40,7 @@
 #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 e0b1ed644..5ea422983 100644
--- a/src/hb-subset.cc
+++ b/src/hb-subset.cc
@@ -637,8 +637,3 @@ 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