#define cmPkDgn(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack Dgn */
#define cmPkAction(x, mBuf) SPkS16(x, mBuf) /* pack Action */
#define cmPkSeqS16(x, mBuf) SPkS16(x, mBuf) /* pack SeqS16 */
-#define cmPkSeqU16(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack SeqU16 */
+#define cmPkSeqUInt16(x, mBuf) oduUnpackUInt16(x, mBuf) /* pack SeqUInt16 */
#define cmPkSeqS24(x, mBuf) SPkS32(x, mBuf) /* pack SeqS24 */
-#define cmPkSeqU24(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack SeqU24 */
+#define cmPkSeqUInt24(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack SeqUInt24 */
#define cmPkSetUpArb(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack SetUpArb */
#define cmPkEvntType(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack EvntType */
#define cmPkState(x, mBuf) oduUnpackUInt8(x, mBuf) /* pack State */
#define cmPkTpInstId(x, mBuf) oduUnpackUInt32(x, mBuf) /* pack TpInstId */
/* PNNI specific typedefs */
-#define cmPkPnPortId(x, mBuf) oduUnpackUInt32(x, mBuf)
+#define cmPkPnPortId(x, mBuf) oduUnpackUInt32(x, mBuf)
\f
/* unpacking macros */
/* system services typedefs */
-#define oduUnpackBool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Bool */
+#define oduUnpackBool(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Bool */
#define cmUnpkStatus(x, mBuf) SUnpkS16(x, mBuf) /* unpack Status */
#define cmUnpkTicks(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Ticks */
#define cmUnpkQLen(x, mBuf) SUnpkS16(x, mBuf) /* unpack QLen */
#define cmUnpkDgn(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Dgn */
#define cmUnpkAction(x, mBuf) SUnpkS16(x, mBuf) /* unpack Action */
#define cmUnpkSeqS16(x, mBuf) SUnpkS16(x, mBuf) /* unpack SeqS16 */
-#define cmUnpkSeqU16(x, mBuf) oduPackUInt16(x, mBuf) /* unpack SeqU16 */
+#define cmUnpkSeqUInt16(x, mBuf) oduPackUInt16(x, mBuf) /* unpack SeqUInt16 */
#define cmUnpkSeqS24(x, mBuf) SUnpkS32(x, mBuf) /* unpack SeqS24 */
-#define cmUnpkSeqU24(x, mBuf) oduPackUInt32(x, mBuf) /* unpack SeqU24 */
+#define cmUnpkSeqUInt24(x, mBuf) oduPackUInt32(x, mBuf) /* unpack SeqUInt24 */
#define cmUnpkSetUpArb(x, mBuf) oduPackUInt8(x, mBuf) /* unpack SetUpArb */
#define cmUnpkEvntType(x, mBuf) oduPackUInt8(x, mBuf) /* unpack EvntType */
#define cmUnpkState(x, mBuf) oduPackUInt8(x, mBuf) /* unpack State */