-#define cmUnpkIpAddr(x, mBuf) SUnpkU32(x, mBuf) /* unpack IpAddr */
-#define cmUnpkPort(x, mBuf) SUnpkU16(x, mBuf) /* unpack Port */
-#define cmUnpkCmd(x, mBuf) SUnpkU8(x, mBuf) /* unpack Cmd */
-#define cmUnpkFlags(x, mBuf) SUnpkU8(x, mBuf) /* unpack Flags */
-#define cmUnpkTtl(x, mBuf) SUnpkU8(x, mBuf) /* unpack Ttl */
-#define cmUnpkPrec(x, mBuf) SUnpkU8(x, mBuf) /* unpack Prec */
-#define cmUnpkWindow(x, mBuf) SUnpkU32(x, mBuf) /* unpack Window */
+#define cmUnpkIpAddr(x, mBuf) oduPackUInt32(x, mBuf) /* unpack IpAddr */
+#define cmUnpkPort(x, mBuf) oduPackUInt16(x, mBuf) /* unpack Port */
+#define cmUnpkCmd(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Cmd */
+#define cmUnpkFlags(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Flags */
+#define cmUnpkTtl(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Ttl */
+#define cmUnpkPrec(x, mBuf) oduPackUInt8(x, mBuf) /* unpack Prec */
+#define cmUnpkWindow(x, mBuf) oduPackUInt32(x, mBuf) /* unpack Window */