Index: third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
diff --git a/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh b/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
index ea61f5c1bd5f872e5794b71f89e3ae8661549a82..5b21f1427660cee8f5e00a1c539a765fbf81428f 100644 |
--- a/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
+++ b/third_party/harfbuzz-ng/src/hb-ot-layout-common-private.hh |
@@ -34,6 +34,14 @@ |
#include "hb-set-private.hh" |
+#ifndef HB_MAX_NESTING_LEVEL |
+#define HB_MAX_NESTING_LEVEL 6 |
+#endif |
+#ifndef HB_MAX_CONTEXT_LENGTH |
+#define HB_MAX_CONTEXT_LENGTH 64 |
+#endif |
+ |
+ |
namespace OT { |
@@ -44,8 +52,6 @@ namespace OT { |
#define NOT_COVERED ((unsigned int) -1) |
-#define MAX_NESTING_LEVEL 6 |
-#define MAX_CONTEXT_LENGTH 64 |
@@ -573,6 +579,11 @@ struct LookupFlag : USHORT |
DEFINE_SIZE_STATIC (2); |
}; |
+} /* namespace OT */ |
+/* This has to be outside the namespace. */ |
+HB_MARK_AS_FLAG_T (OT::LookupFlag::Flags); |
+namespace OT { |
+ |
struct Lookup |
{ |
inline unsigned int get_subtable_count (void) const { return subTable.len; } |