diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-04-05 14:53:08 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-04-06 01:47:43 +0200 |
| commit | 6aa12fcb30c8f7246fd0215b1d808191c0d87668 (patch) | |
| tree | 92eb805ea2ed03b1e42f6ce55ca26a65a92761fb /source3/include/includes.h | |
| parent | 48166468fe3ca515dae3431bbe674809489f743c (diff) | |
| download | samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.gz samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.tar.bz2 samba-6aa12fcb30c8f7246fd0215b1d808191c0d87668.zip | |
build: Remove SMB_OFF_T, replace with off_t
Now that we always require a 64 bit off_t, we no longer need SMB_OFF_T.
Andrew Bartlett
Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Fri Apr 6 01:47:43 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/include/includes.h')
| -rw-r--r-- | source3/include/includes.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h index 8e5b1cd41f..7bdd20074a 100644 --- a/source3/include/includes.h +++ b/source3/include/includes.h @@ -298,10 +298,6 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; #define INO_T_VAL(p, ofs) ((SMB_INO_T)(IVAL((p),(ofs)))) #endif -#ifndef SMB_OFF_T -# define SMB_OFF_T off_t -#endif - /* TODO: remove this macros */ #define SBIG_UINT(p, ofs, v) SBVAL(p, ofs, v) #define BIG_UINT(p, ofs) BVAL(p, ofs) @@ -310,7 +306,7 @@ typedef sig_atomic_t volatile SIG_ATOMIC_T; /* this should really be a 64 bit type if possible */ typedef uint64_t br_off; -#define SMB_OFF_T_BITS (sizeof(SMB_OFF_T)*8) +#define SMB_OFF_T_BITS (sizeof(off_t)*8) /* * Set the define that tells us if we can do 64 bit @@ -319,7 +315,7 @@ typedef uint64_t br_off; #define SOFF_T(p, ofs, v) (SIVAL(p,ofs,(v)&0xFFFFFFFF), SIVAL(p,(ofs)+4,(v)>>32)) #define SOFF_T_R(p, ofs, v) (SIVAL(p,(ofs)+4,(v)&0xFFFFFFFF), SIVAL(p,ofs,(v)>>32)) -#define IVAL_TO_SMB_OFF_T(buf,off) ((SMB_OFF_T)(( ((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF) ))) +#define IVAL_TO_SMB_OFF_T(buf,off) ((off_t)(( ((uint64_t)(IVAL((buf),(off)))) & ((uint64_t)0xFFFFFFFF) ))) #ifndef HAVE_BLKSIZE_T /* This is mainly for HP/UX which defines st_blksize as long */ |