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

@@ -48,14 +48,12 @@
   FWORD         lsb; /* Leading (left/top) side bearing. */
   public:
   DEFINE_SIZE_STATIC (4);
 };
 
-struct _mtx
+struct hmtxvmtx
 {
-  static const hb_tag_t tableTag = HB_TAG('_','m','t','x');
-
   static const hb_tag_t hmtxTag = HB_OT_TAG_hmtx;
   static const hb_tag_t vmtxTag = HB_OT_TAG_vmtx;
 
   inline bool sanitize (hb_sanitize_context_t *c) const
   {

@@ -89,14 +87,14 @@
                                          * values for each glyph. */
   public:
   DEFINE_SIZE_ARRAY2 (0, longMetric, leadingBearingX);
 };
 
-struct hmtx : _mtx {
+struct hmtx : hmtxvmtx {
   static const hb_tag_t tableTag        = HB_OT_TAG_hmtx;
 };
-struct vmtx : _mtx {
+struct vmtx : hmtxvmtx {
   static const hb_tag_t tableTag        = HB_OT_TAG_vmtx;
 };
 
 } /* namespace OT */