diff options
| author | Stefan Metzmacher <metze@samba.org> | 2011-04-23 11:10:05 +0200 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2011-04-24 09:48:50 +0200 |
| commit | d7aa2eb7b664c10551cb45c36d3b564d829e9d44 (patch) | |
| tree | 807ecfdfd30bc537671be72aa49f6bf4ef01786f | |
| parent | 9127e555ab043000adc516a9177e43812e52fd4b (diff) | |
| download | samba-d7aa2eb7b664c10551cb45c36d3b564d829e9d44.tar.gz samba-d7aa2eb7b664c10551cb45c36d3b564d829e9d44.tar.bz2 samba-d7aa2eb7b664c10551cb45c36d3b564d829e9d44.zip | |
s3:includes: simplify BIG_UINT macros
metze
| -rw-r--r-- | source3/include/includes.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index a76942faad..e524b2afff 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; |