From 5b327085775f279976c66cdd5f105132fda0965a Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 23 Apr 2011 11:15:30 +0200 Subject: s3:includes: simplify INO_T_VAL macros metze --- source3/include/includes.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/source3/include/includes.h b/source3/include/includes.h index e524b2afff..8f220dfaec 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -308,10 +308,10 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; #endif #ifdef LARGE_SMB_INO_T -#define SINO_T_VAL(p, ofs, v) (SIVAL((p),(ofs),(v)&0xFFFFFFFF), SIVAL((p),(ofs)+4,(v)>>32)) -#define INO_T_VAL(p, ofs) ((SMB_INO_T)(((uint64_t)(IVAL(p,ofs)))| (((uint64_t)(IVAL(p,(ofs)+4))) << 32))) +#define SINO_T_VAL(p, ofs, v) SBVAL(p, ofs, v) +#define INO_T_VAL(p, ofs) ((SMB_INO_T)BVAL(p, ofs)) #else -#define SINO_T_VAL(p, ofs, v) (SIVAL(p,ofs,v),SIVAL(p,(ofs)+4,0)) +#define SINO_T_VAL(p, ofs, v) SBVAL(p, ofs, ((uint64_t)(v)) & UINT32_MAX) #define INO_T_VAL(p, ofs) ((SMB_INO_T)(IVAL((p),(ofs)))) #endif -- cgit