Merge pull request #688 from keithc-ca/aix_harfbuzz

Fix missing definition of harfbuzz function on AIX
ibmruntimes · Aug 1, 2023 · fd11223 · fd11223
2 parents c405bdd + 23f53fa
commit fd11223
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/java.desktop/share/native/libharfbuzz/hb-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-map.hh
@@ -78,6 +78,10 @@ struct hb_hashmap_t
  is_used_ (false), is_tombstone_ (false),
  value () {}
 
+ // Needed for https://github.com/harfbuzz/harfbuzz/issues/4138
+ K& get_key () { return key; }
+ V& get_value () { return value; }
+
  bool is_used () const { return is_used_; }
  void set_used (bool is_used) { is_used_ = is_used; }
  bool is_tombstone () const { return is_tombstone_; }
@@ -349,7 +353,7 @@ struct hb_hashmap_t
  auto keys_ref () const HB_AUTO_RETURN
  (
  + iter_items ()
- | hb_map (&item_t::key)
+ | hb_map (&item_t::get_key)
  )
  auto keys () const HB_AUTO_RETURN
  (
@@ -359,7 +363,7 @@ struct hb_hashmap_t
  auto values_ref () const HB_AUTO_RETURN
  (
  + iter_items ()
- | hb_map (&item_t::value)
+ | hb_map (&item_t::get_value)
  )
  auto values () const HB_AUTO_RETURN
  (

diff --git a/src/java.desktop/share/native/libharfbuzz/hb-subset.cc b/src/java.desktop/share/native/libharfbuzz/hb-subset.cc
@@ -43,11 +43,7 @@
 #include "OT/Color/sbix/sbix.hh"
 #include "hb-ot-os2-table.hh"
 #include "hb-ot-post-table.hh"
-
-#if !defined(AIX)
 #include "hb-ot-post-table-v2subset.hh"
-#endif
-
 #include "hb-ot-cff1-table.hh"
 #include "hb-ot-cff2-table.hh"
 #include "hb-ot-vorg-table.hh"