Revert "Move hb-ot-name-language-static.hh out of hb-static.cc"
This reverts commit 7b5f0dd3a8
.
Fixes https://github.com/harfbuzz/harfbuzz/issues/4203
This commit is contained in:
parent
e76a3649db
commit
4129061e37
|
@ -181,6 +181,4 @@ hb_ot_name_get_utf32 (hb_face_t *face,
|
||||||
return hb_ot_name_get_utf<hb_utf32_t> (face, name_id, language, text_size, text);
|
return hb_ot_name_get_utf<hb_utf32_t> (face, name_id, language, text_size, text);
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "hb-ot-name-language-static.hh"
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include "hb-ot-maxp-table.hh"
|
#include "hb-ot-maxp-table.hh"
|
||||||
|
|
||||||
#ifndef HB_NO_VISIBILITY
|
#ifndef HB_NO_VISIBILITY
|
||||||
|
#include "hb-ot-name-language-static.hh"
|
||||||
|
|
||||||
uint64_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)] = {};
|
uint64_t const _hb_NullPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)] = {};
|
||||||
/*thread_local*/ uint64_t _hb_CrapPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)] = {};
|
/*thread_local*/ uint64_t _hb_CrapPool[(HB_NULL_POOL_SIZE + sizeof (uint64_t) - 1) / sizeof (uint64_t)] = {};
|
||||||
|
|
|
@ -637,8 +637,3 @@ hb_subset_plan_execute_or_fail (hb_subset_plan_t *plan)
|
||||||
end:
|
end:
|
||||||
return success ? hb_face_reference (plan->dest) : nullptr;
|
return success ? hb_face_reference (plan->dest) : nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef HB_NO_VISIBILITY
|
|
||||||
/* If NO_VISIBILITY, libharfbuzz has this. */
|
|
||||||
#include "hb-ot-name-language-static.hh"
|
|
||||||
#endif
|
|
||||||
|
|
Loading…
Reference in New Issue