From ceb4c212dc91a277f646c4a5354e4362f548a9f6 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 2 Jul 2019 16:02:13 -0700
Subject: [PATCH] [amalgam] Fix UCD issue

This actually makes it build now!

Part https://github.com/harfbuzz/harfbuzz/issues/1809

Keeping open to add tests, CI, etc.
---
 src/hb-ucd.cc     | 5 +----
 src/hb-unicode.cc | 2 --
 src/hb-unicode.hh | 3 +++
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/hb-ucd.cc b/src/hb-ucd.cc
index 69949a288..b29f2a9c7 100644
--- a/src/hb-ucd.cc
+++ b/src/hb-ucd.cc
@@ -15,6 +15,7 @@
  */
 
 #include "hb.hh"
+#include "hb-unicode.hh"
 #include "hb-machinery.hh"
 
 #include "hb-ucd-table.hh"
@@ -235,10 +236,6 @@ void free_static_ucd_funcs ()
 }
 #endif
 
-extern "C" HB_INTERNAL
-hb_unicode_funcs_t *
-hb_ucd_get_unicode_funcs ();
-
 hb_unicode_funcs_t *
 hb_ucd_get_unicode_funcs ()
 {
diff --git a/src/hb-unicode.cc b/src/hb-unicode.cc
index ed4fb7782..e2deaa240 100644
--- a/src/hb-unicode.cc
+++ b/src/hb-unicode.cc
@@ -126,8 +126,6 @@ hb_unicode_decompose_compatibility_nil (hb_unicode_funcs_t *ufuncs     HB_UNUSED
 }
 #endif
 
-
-extern "C" hb_unicode_funcs_t *hb_ucd_get_unicode_funcs ();
 extern "C" hb_unicode_funcs_t *hb_glib_get_unicode_funcs ();
 extern "C" hb_unicode_funcs_t *hb_icu_get_unicode_funcs ();
 
diff --git a/src/hb-unicode.hh b/src/hb-unicode.hh
index 021fa461d..9b181c11c 100644
--- a/src/hb-unicode.hh
+++ b/src/hb-unicode.hh
@@ -395,4 +395,7 @@ HB_INTERNAL bool
 _hb_unicode_is_emoji_Extended_Pictographic (hb_codepoint_t cp);
 
 
+extern "C" HB_INTERNAL hb_unicode_funcs_t *hb_ucd_get_unicode_funcs ();
+
+
 #endif /* HB_UNICODE_HH */