aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2012-01-23 10:58:55 +0100
committerHenrik Nord <[email protected]>2012-01-23 10:59:17 +0100
commite0e8c6a33b6482b3de013977ca3ec579283837e5 (patch)
tree8e7857123bd7bb8daf4f3cae2beb14ebf6964445
parent635c55a853a8a5e4b7bf7280058a4a707b656964 (diff)
parenta94aded8c179c278066c3d86f8878b0c1f3e8f73 (diff)
downloadotp-e0e8c6a33b6482b3de013977ca3ec579283837e5.tar.gz
otp-e0e8c6a33b6482b3de013977ca3ec579283837e5.tar.bz2
otp-e0e8c6a33b6482b3de013977ca3ec579283837e5.zip
Merge branch 'jz/sendfile_chunk_size' into maint
* jz/sendfile_chunk_size: erts: change SENDFILE_CHUNK_SIZE from signed to unsigned Conflicts: erts/emulator/drivers/unix/unix_efile.c OTP-9872
-rw-r--r--erts/emulator/drivers/unix/unix_efile.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/erts/emulator/drivers/unix/unix_efile.c b/erts/emulator/drivers/unix/unix_efile.c
index e7dd9d2bdb..f4be8e6a2e 100644
--- a/erts/emulator/drivers/unix/unix_efile.c
+++ b/erts/emulator/drivers/unix/unix_efile.c
@@ -1406,10 +1406,9 @@ efile_fadvise(Efile_error* errInfo, int fd, Sint64 offset,
}
#ifdef HAVE_SENDFILE
-
// For some reason the maximum size_t cannot be used as the max size
// 3GB seems to work on all platforms
-#define SENDFILE_CHUNK_SIZE ((1 << 30) -1)
+#define SENDFILE_CHUNK_SIZE ((1UL << 30) -1)
/*
* sendfile: The implementation of the sendfile system call varies