-#define thunk_field_(str, s_type, field) \
- thunk_field_offset_(str,s_type,field) \
- field_type_(str, s_type, field); \
- thunk_field_macro(str)
-/*
- * Byte offset and MachRep for a TSO field, minus the header and
- * variable prof bit.
- */
-#define tso_offset(s_type, field) \
+/* Byte offset for a TSO field, minus the header and variable prof bit. */
+#define tso_payload_offset(s_type, field) \