From fee0f41c6c1e50621d10b07802ca36a9b295b53d Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 28 Aug 2018 18:27:41 -0700 Subject: [PATCH] Don't declare extern symbols as inline clang -O3 was completely removing _get_gdef(), causing link failure when needed from another compilation unit. Surprisingly, "extern inline" didn't fix it. --- src/hb-ot-layout.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc index 8b247704e..345078917 100644 --- a/src/hb-ot-layout.cc +++ b/src/hb-ot-layout.cc @@ -56,7 +56,7 @@ // return *(data->base.get ()); // } -inline const OT::GDEF& _get_gdef (hb_face_t *face) +const OT::GDEF& _get_gdef (hb_face_t *face) { if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(OT::GDEF); return *hb_ot_face_data (face)->GDEF->table; @@ -71,7 +71,7 @@ static inline const OT::GSUB& _get_gsub (hb_face_t *face) if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(OT::GSUB); return *hb_ot_face_data (face)->GSUB->table; } -inline const OT::GSUB& _get_gsub_relaxed (hb_face_t *face) +const OT::GSUB& _get_gsub_relaxed (hb_face_t *face) { return *hb_ot_face_data (face)->GSUB.get_relaxed ()->table; } @@ -85,7 +85,7 @@ static inline const OT::GPOS& _get_gpos (hb_face_t *face) if (unlikely (!hb_ot_shaper_face_data_ensure (face))) return Null(OT::GPOS); return *hb_ot_face_data (face)->GPOS->table; } -inline const OT::GPOS& _get_gpos_relaxed (hb_face_t *face) +const OT::GPOS& _get_gpos_relaxed (hb_face_t *face) { return *hb_ot_face_data (face)->GPOS.get_relaxed ()->table; }