summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorTim Potter <tpot@samba.org>2003-11-05 17:26:43 +0000
committerTim Potter <tpot@samba.org>2003-11-05 17:26:43 +0000
commit0467255bfed3c80eb1fcbc0ffc17cffb36c6dbfc (patch)
tree7b29de5452e68d3a8063cbc9a0c25eb65b7539e8 /source3
parent41847b388f0eff3b6fdd0b304eeec0c31475eb6d (diff)
downloadsamba-0467255bfed3c80eb1fcbc0ffc17cffb36c6dbfc.tar.gz
samba-0467255bfed3c80eb1fcbc0ffc17cffb36c6dbfc.tar.bz2
samba-0467255bfed3c80eb1fcbc0ffc17cffb36c6dbfc.zip
Merge from 3.0:
Revision 1.10.2.6: Cast to fix warning on Solaris sendfile - check buildfarm output to see if this works! Bug #706. (This used to be commit 06c4fc35a7226e719c2748b818ecf4e18dd1a4fb)
Diffstat (limited to 'source3')
-rw-r--r--source3/lib/sendfile.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source3/lib/sendfile.c b/source3/lib/sendfile.c
index bcc8cb08ca..4aa76a0c74 100644
--- a/source3/lib/sendfile.c
+++ b/source3/lib/sendfile.c
@@ -161,7 +161,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
vec[0].sfv_fd = SFV_FD_SELF;
vec[0].sfv_flag = 0;
- vec[0].sfv_off = header->data;
+ vec[0].sfv_off = (off_t)header->data;
vec[0].sfv_len = hdr_len = header->length;
vec[1].sfv_fd = fromfd;