diff options
author | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
---|---|---|
committer | Andrew Bartlett <abartlet@samba.org> | 2008-10-14 11:16:59 +1100 |
commit | 551e95502765bae58d5ccf57635e4977b7b47b9b (patch) | |
tree | d0c797cbc5044a882e1aac6094f661edb2c070d1 /source3/include/smb.h | |
parent | 9dcbddd5c61e8bf2814e97e53e7c518df87661c0 (diff) | |
parent | 4746f79d50d804b0e9d5d5cc0d4796dee54d052c (diff) | |
download | samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.gz samba-551e95502765bae58d5ccf57635e4977b7b47b9b.tar.bz2 samba-551e95502765bae58d5ccf57635e4977b7b47b9b.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into abartlet-devel
Diffstat (limited to 'source3/include/smb.h')
-rw-r--r-- | source3/include/smb.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h index fb79e91121..732bef1212 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -360,7 +360,7 @@ typedef struct { struct fd_handle { size_t ref_count; int fd; - SMB_BIG_UINT position_information; + uint64_t position_information; SMB_OFF_T pos; uint32 private_options; /* NT Create options, but we only look at * NTCREATEX_OPTIONS_PRIVATE_DENY_DOS and @@ -436,7 +436,7 @@ typedef struct files_struct { unsigned int num_smb_operations; uint16 rap_print_jobid; struct file_id file_id; - SMB_BIG_UINT initial_allocation_size; /* Faked up initial allocation on disk. */ + uint64_t initial_allocation_size; /* Faked up initial allocation on disk. */ mode_t mode; uint16 file_pid; uint16 vuid; @@ -547,10 +547,10 @@ struct stream_struct { struct dfree_cached_info { time_t last_dfree_time; - SMB_BIG_UINT dfree_ret; - SMB_BIG_UINT bsize; - SMB_BIG_UINT dfree; - SMB_BIG_UINT dsize; + uint64_t dfree_ret; + uint64_t bsize; + uint64_t dfree; + uint64_t dsize; }; struct dptr_struct; |