[indic-generator] Move INDIC_COMBINE_CATEGORIES here

src/gen-indic-table.py

@@ -553,6 +553,8 @@ for s in what_short:
 print ()
 print ('#pragma GCC diagnostic pop')
 print ()
+print ("#define INDIC_COMBINE_CATEGORIES(S,M) ((S) | ((M) << 8))")
+print ()
 print ("#define _(S,M) INDIC_COMBINE_CATEGORIES (%s_##S, %s_##M)" % tuple(what_short))
 print ()
 print ()
@@ -648,6 +650,7 @@ print ("  return _(X,X);")
 print ("}")
 print ()
 print ("#undef _")
+print ("#undef INDIC_COMBINE_CATEGORIES")
 for i in range (2):
 	print ()
 	vv = sorted (values[i].keys ())

src/hb-ot-shaper-indic-table.cc

@@ -74,6 +74,8 @@
 
 #pragma GCC diagnostic pop
 
+#define INDIC_COMBINE_CATEGORIES(S,M) ((S) | ((M) << 8))
+
 #define _(S,M) INDIC_COMBINE_CATEGORIES (_OT_##S, _POS_##M)
 
 
@@ -482,6 +484,7 @@ hb_indic_get_categories (hb_codepoint_t u)
 }
 
 #undef _
+#undef INDIC_COMBINE_CATEGORIES
 
 #undef _OT_A
 #undef _OT_As

src/hb-ot-shaper-indic.hh

@@ -133,8 +133,6 @@ enum ot_position_t {
 };
 
 
-#define INDIC_COMBINE_CATEGORIES(S,M) ((S) | ((M) << 8))
-
 HB_INTERNAL uint16_t
 hb_indic_get_categories (hb_codepoint_t u);