From 8196c377ac286e9ded709f020e657847c970581d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 23 Apr 2011 11:10:05 +0200 Subject: [PATCH] s3:includes: simplify BIG_UINT macros metze (cherry picked from commit d7aa2eb7b664c10551cb45c36d3b564d829e9d44) (cherry picked from commit 90edf53dd5d3768ad97748cca90cb177709223dd) --- source3/include/includes.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source3/include/includes.h b/source3/include/includes.h index 54459a5513e..f3a9f1b316f 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -323,11 +323,10 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; # endif #endif -#define SBIG_UINT(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) -#define BIG_UINT(p, ofs) ((((uint64_t) IVAL(p,(ofs)+4))<<32)|IVAL(p,ofs)) -#define IVAL2_TO_SMB_BIG_UINT(buf,off) ( (((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF)) | \ - (( ((uint64_t)(IVAL((buf),(off+4)))) & ((uint64_t)0xFFFFFFFF) ) << 32 ) ) - +/* TODO: remove this macros */ +#define SBIG_UINT(p, ofs, v) SBVAL(p, ofs, v) +#define BIG_UINT(p, ofs) BVAL(p, ofs) +#define IVAL2_TO_SMB_BIG_UINT(p, ofs) BVAL(p, ofs) /* this should really be a 64 bit type if possible */ typedef uint64_t br_off; -- 2.11.4.GIT