summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2002-09-14 01:38:55 +0000
committerJeremy Allison <jra@samba.org>2002-09-14 01:38:55 +0000
commit3f02393bfd49dea3f48fdb759d8f932d5bb3a8f6 (patch)
treeb5ce92e427b6fb88ee1013fb5f6a1d5190ec5224
parentfebd3f929b0f922a4bac69aa131089da4675cb1e (diff)
downloadsamba-3f02393bfd49dea3f48fdb759d8f932d5bb3a8f6.tar.gz
samba-3f02393bfd49dea3f48fdb759d8f932d5bb3a8f6.tar.bz2
samba-3f02393bfd49dea3f48fdb759d8f932d5bb3a8f6.zip
Use HAVE_SENDFILE64, not SENDFILE64.
Jeremy. (This used to be commit 7e2f9769c9a7ee5d11267a8a8864371fc0aa8f50)
-rw-r--r--source3/lib/sendfile.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/source3/lib/sendfile.c b/source3/lib/sendfile.c
index 2707495d5b..4613cfb864 100644
--- a/source3/lib/sendfile.c
+++ b/source3/lib/sendfile.c
@@ -59,7 +59,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
while (total) {
ssize_t nwritten;
do {
-#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(SENDFILE64)
+#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(HAVE_SENDFILE64)
nwritten = sendfile64(tofd, fromfd, &offset, total);
#else
nwritten = sendfile(tofd, fromfd, &offset, total);
@@ -133,8 +133,11 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
#elif defined(SOLARIS_SENDFILE_API)
+/* Hmmm. Can't find Solaris sendfile API docs.... Where is it ? */
ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T offset, size_t count)
{
+ errno = ENOSYS;
+ return -1;
}
#elif defined(HPUX_SENDFILE_API)
@@ -171,7 +174,7 @@ ssize_t sys_sendfile(int tofd, int fromfd, const DATA_BLOB *header, SMB_OFF_T of
*/
do {
-#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(SENDFILE64)
+#if defined(HAVE_EXPLICIT_LARGEFILE_SUPPORT) && defined(HAVE_OFF64_T) && defined(HAVE_SENDFILE64)
nwritten = sendfile64(tofd, fromfd, offset, total, &hdtrl[0], 0);
#else
nwritten = sendfile(tofd, fromfd, offset, total, &hdtrl[0], 0);