src/java.desktop/share/native/libfontmanager/harfbuzz/hb-ot-name-table.hh

*** 40,51 ****
  #define HB_OT_TAG_name HB_TAG('n','a','m','e')
  
  
  struct NameRecord
  {
!   static int cmp (const NameRecord *a, const NameRecord *b)
    {
      int ret;
      ret = b->platformID.cmp (a->platformID);
      if (ret) return ret;
      ret = b->encodingID.cmp (a->encodingID);
      if (ret) return ret;
--- 40,53 ----
  #define HB_OT_TAG_name HB_TAG('n','a','m','e')
  
  
  struct NameRecord
  {
!   static int cmp (const void *pa, const void *pb)
    {
+     const NameRecord *a = (const NameRecord *) pa;
+     const NameRecord *b = (const NameRecord *) pb;
      int ret;
      ret = b->platformID.cmp (a->platformID);
      if (ret) return ret;
      ret = b->encodingID.cmp (a->encodingID);
      if (ret) return ret;
*** 87,97 ****
      NameRecord key;
      key.platformID.set (platform_id);
      key.encodingID.set (encoding_id);
      key.languageID.set (language_id);
      key.nameID.set (name_id);
!     NameRecord *match = (NameRecord *) bsearch (&key, nameRecord, count, sizeof (nameRecord[0]), (hb_compare_func_t) NameRecord::cmp);
  
      if (!match)
        return 0;
  
      unsigned int length = MIN (buffer_length, (unsigned int) match->length);
--- 89,99 ----
      NameRecord key;
      key.platformID.set (platform_id);
      key.encodingID.set (encoding_id);
      key.languageID.set (language_id);
      key.nameID.set (name_id);
!     NameRecord *match = (NameRecord *) bsearch (&key, nameRecord, count, sizeof (nameRecord[0]), NameRecord::cmp);
  
      if (!match)
        return 0;
  
      unsigned int length = MIN (buffer_length, (unsigned int) match->length);