-#define TYPE_INT 0 /* the stack slot types must numbered in the */
-#define TYPE_LNG 1 /* same order as the ICMD_Ixxx to ICMD_Axxx */
-#define TYPE_FLT 2 /* instructions (LOAD and STORE) */
-#define TYPE_DBL 3 /* integer, long, float, double, address */
-#define TYPE_ADR 4
+/* XXX unified these with longer names. Maybe someday use only
+ * one set of names? -Edwin
+ */
+/*#define TYPE_INT 0*/ /* the stack slot types must numbered in the */
+#define TYPE_LNG TYPE_LONG /*1*/ /* same order as the ICMD_Ixxx to ICMD_Axxx */
+#define TYPE_FLT TYPE_FLOAT /*2*/ /* instructions (LOAD and STORE) */
+#define TYPE_DBL TYPE_DOUBLE /*3*/ /* integer, long, float, double, address */
+#define TYPE_ADR TYPE_ADDRESS /*4*/