Merge pull request #692 from keithc-ca/harfbuzz

Fix harfbuzz for AIX
ibmruntimes · Aug 10, 2023 · a014b87 · a014b87
2 parents efef17e + 5413b43
commit a014b87
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/java.base/share/classes/java/util/Timer.java b/src/java.base/share/classes/java/util/Timer.java
@@ -25,7 +25,7 @@
 
 /*
  * ===========================================================================
- * (c) Copyright IBM Corp. 2022, 2022 All Rights Reserved
+ * (c) Copyright IBM Corp. 2022, 2023 All Rights Reserved
  * ===========================================================================
  */
 
@@ -532,6 +532,7 @@ class TimerThread extends Thread {
  private TaskQueue queue;
 
  TimerThread(TaskQueue queue) {
+ super("java.util.TimerThread");
  this.queue = queue;
  }
 

diff --git a/src/java.desktop/share/native/libharfbuzz/hb-map.hh b/src/java.desktop/share/native/libharfbuzz/hb-map.hh
@@ -347,8 +347,7 @@ struct hb_hashmap_t
  )
  auto keys () const HB_AUTO_RETURN
  (
- + iter_items ()
- | hb_map (&item_t::get_key)
+ + keys_ref ()
  | hb_map (hb_ridentity)
  )
  auto values_ref () const HB_AUTO_RETURN
@@ -358,8 +357,7 @@ struct hb_hashmap_t
  )
  auto values () const HB_AUTO_RETURN
  (
- + iter_items ()
- | hb_map (&item_t::get_value)
+ + values_ref ()
  | hb_map (hb_ridentity)
  )
 

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"