Commit 1c60d219 authored by Wayne Davison's avatar Wayne Davison

Got rid of the NVAL*() defines.

parent 473feecf
......@@ -34,17 +34,6 @@
#define UVAL(buf,pos) ((uint32)CVAL(buf,pos))
#define SCVAL(buf,pos,val) (CVAL(buf,pos) = (val))
/* Our 64-bit numbers are sent in MSB-first order so that we can use
* the highest bits to indicate the number of bytes sent. */
#define NVAL1(b,m) (UVAL(b,0)&~(uint32)(m))
#define NVAL2(b,m) (NVAL1(b,m)<<8|UVAL(b,1))
#define NVAL3(b,m) (NVAL2(b,m)<<8|UVAL(b,2))
#define NVAL4(b,m) (NVAL3(b,m)<<8|UVAL(b,3))
#define NVAL5(b,m) ((int64)NVAL4(b,m)<<8|UVAL(b,4))
#define NVAL6(b,m) (NVAL5(b,m)<<8|UVAL(b,5))
#define NVAL7(b,m) (NVAL6(b,m)<<8|UVAL(b,6))
#define NVAL8(b,m) (NVAL7(b,m)<<8|UVAL(b,7))
#if CAREFUL_ALIGNMENT
#define PVAL(buf,pos) (UVAL(buf,pos)|UVAL(buf,(pos)+1)<<8)
#define IVAL(buf,pos) (PVAL(buf,pos)|PVAL(buf,(pos)+2)<<16)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment