-# define STORE64_B(p, v) \
- (PUTBYTE((p), 0, (uint64)(v) >> 56), \
- PUTBYTE((p), 1, (uint64)(v) >> 48), \
- PUTBYTE((p), 2, (uint64)(v) >> 40), \
- PUTBYTE((p), 3, (uint64)(v) >> 32), \
- PUTBYTE((p), 4, (uint64)(v) >> 24), \
- PUTBYTE((p), 5, (uint64)(v) >> 16), \
- PUTBYTE((p), 6, (uint64)(v) >> 8), \
- PUTBYTE((p), 7, (uint64)(v) >> 0))
-# define STORE64_L(p, v) \
- (PUTBYTE((p), 0, (uint64)(v) >> 0), \
- PUTBYTE((p), 1, (uint64)(v) >> 8), \
- PUTBYTE((p), 2, (uint64)(v) >> 16), \
- PUTBYTE((p), 3, (uint64)(v) >> 24), \
- PUTBYTE((p), 4, (uint64)(v) >> 32), \
- PUTBYTE((p), 5, (uint64)(v) >> 40), \
- PUTBYTE((p), 6, (uint64)(v) >> 48), \
- PUTBYTE((p), 7, (uint64)(v) >> 56))
+# ifndef STORE64_B
+# define STORE64_B(p, v) \
+ (STORE32_B((octet *)(p) + 0, (uint64)(v) >> 32), \
+ STORE32_B((octet *)(p) + 4, (uint64)(v) >> 0))
+# endif
+# ifndef STORE64_L
+# define STORE64_L(p, v) \
+ (STORE32_L((octet *)(p) + 0, (uint64)(v) >> 0), \
+ STORE32_L((octet *)(p) + 4, (uint64)(v) >> 32))
+# endif