From 6e4736a3c5acc0eea1b16c79b95d1a3082baa320 Mon Sep 17 00:00:00 2001 From: Ebrahim Byagowi Date: Sat, 14 Sep 2019 10:38:52 +0430 Subject: [PATCH] [name] Undef entry_{index,score} to avoid collision in amalgam builds --- src/hb-ot-name-table.hh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/hb-ot-name-table.hh b/src/hb-ot-name-table.hh index 4a8b57fe1..7a7f41d82 100644 --- a/src/hb-ot-name-table.hh +++ b/src/hb-ot-name-table.hh @@ -330,6 +330,9 @@ struct name DEFINE_SIZE_ARRAY (6, nameRecordZ); }; +#undef entry_index +#undef entry_score + struct name_accelerator_t : name::accelerator_t {}; } /* namespace OT */