diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-04-23 11:15:30 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-04-24 09:48:50 +0200 |
| commit | 5b327085775f279976c66cdd5f105132fda0965a (patch) | |
| tree | 81ccdad0bf9d1d3eaaaf8a016ef2024572182ff3 | |
| parent | d7aa2eb7b664c10551cb45c36d3b564d829e9d44 (diff) | |
| download | samba-5b327085775f279976c66cdd5f105132fda0965a.tar.gz samba-5b327085775f279976c66cdd5f105132fda0965a.tar.bz2 samba-5b327085775f279976c66cdd5f105132fda0965a.zip | |
s3:includes: simplify INO_T_VAL macros
metze
| -rw-r--r-- | source3/include/includes.h | 6 |
1 files 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 |