[HB] Assorted compiler macros
diff --git a/src/hb-ot-layout-open-private.h b/src/hb-ot-layout-open-private.h
index 76a5ade..f46e023 100644
--- a/src/hb-ot-layout-open-private.h
+++ b/src/hb-ot-layout-open-private.h
@@ -215,8 +215,8 @@
     private: char v[BYTES]; \
   }; \
   ASSERT_SIZE (NAME, BYTES)
-#define DEFINE_INT_TYPE0(NAME, type, b)	DEFINE_INT_TYPE1 (NAME, type, hb_be_##type, b)
-#define DEFINE_INT_TYPE(NAME, u, w)	DEFINE_INT_TYPE0 (NAME, u##int##w##_t, (w / 8))
+#define DEFINE_INT_TYPE0(NAME, type, b)	DEFINE_INT_TYPE1 (NAME, type##_t, hb_be_##type, b)
+#define DEFINE_INT_TYPE(NAME, u, w)	DEFINE_INT_TYPE0 (NAME, u##int##w, (w / 8))
 
 
 DEFINE_INT_TYPE (USHORT,  u, 16);	/* 16-bit unsigned integer. */