diff options
author | Erlang/OTP <[email protected]> | 2012-01-18 11:14:14 +0100 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2012-01-18 11:14:14 +0100 |
commit | 5edf4b3ffa73874c9f612f2d919df9a21fc140c1 (patch) | |
tree | fb5982d66371f2b0cc7397abe8104c69863bd9d0 /erts/emulator/drivers/common/erl_efile.h | |
parent | f8815dc88bd86d6508d2a3dad031ea939fb2b443 (diff) | |
parent | 77b157e42a7fd1a6f325276bdd88fd1a7f6bbea4 (diff) | |
download | otp-5edf4b3ffa73874c9f612f2d919df9a21fc140c1.tar.gz otp-5edf4b3ffa73874c9f612f2d919df9a21fc140c1.tar.bz2 otp-5edf4b3ffa73874c9f612f2d919df9a21fc140c1.zip |
Merge branch 'raimo/64-bit-efile_drv/OTP-9820' into maint
* raimo/64-bit-efile_drv/OTP-9820:
file_SUITE: Assume 64-bit windows has enough memory
erts: Badarg if port output overflows iov_len
prim_file_SUITE: large_file success depends on wordsize
file_SUITE: Increase timeout for large_file
file_SITE,prim_file_SUITE: Accept old OpenBSD pecularity
prim_file_SUITE: large_write - meaner test data and check result content
file_SUITE: large_write - check mem size before creating huge binary
erts: rewrite efile_writev to handle partial writes correctly
erts: Bugfix - driver_deq freed wrong length due to short type (int)
prim_file_SUITE: Add large_write/1
file_SUITE: Add large_write/1
file_SUITE: Refactor large_file/1
file_SUITE: Fix unix_free/1
Diffstat (limited to 'erts/emulator/drivers/common/erl_efile.h')
-rw-r--r-- | erts/emulator/drivers/common/erl_efile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/emulator/drivers/common/erl_efile.h b/erts/emulator/drivers/common/erl_efile.h index 3868b38137..69ad02633c 100644 --- a/erts/emulator/drivers/common/erl_efile.h +++ b/erts/emulator/drivers/common/erl_efile.h @@ -162,7 +162,7 @@ int efile_write_info(Efile_error* errInfo, Efile_info* pInfo, char *name); int efile_write(Efile_error* errInfo, int flags, int fd, char* buf, size_t count); int efile_writev(Efile_error* errInfo, int flags, int fd, - SysIOVec* iov, int iovcnt, size_t size); + SysIOVec* iov, int iovcnt); int efile_read(Efile_error* errInfo, int flags, int fd, char* buf, size_t count, size_t* pBytesRead); int efile_seek(Efile_error* errInfo, int fd, |