diff options
| author | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
|---|---|---|
| committer | trawick <trawick@13f79535-47bb-0310-9956-ffa450edef68> | 2011-03-21 16:55:11 +0000 |
| commit | fc44f8a893521c0f8eb43af8f5783e69ebfe19b1 (patch) | |
| tree | 56dd448c11f77c53a545e0027a8c7ed8814351ec /network_io/win32 | |
| parent | 1760f5378838f561bf8f382293714c9760efb183 (diff) | |
| download | libapr-fc44f8a893521c0f8eb43af8f5783e69ebfe19b1.tar.gz | |
merge trunk revs 1083169, 1083177, 1083178, 1083183, and 1083227
to resolve some gcc warnings and dead code on Windows
(the testlfsabi change from r1083183 is omitted, as the testcases
aren't in this branch)
git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.5.x@1083869 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'network_io/win32')
| -rw-r--r-- | network_io/win32/sendrecv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/network_io/win32/sendrecv.c b/network_io/win32/sendrecv.c index a01f0329a..3fa0c8dda 100644 --- a/network_io/win32/sendrecv.c +++ b/network_io/win32/sendrecv.c @@ -210,6 +210,7 @@ APR_DECLARE(apr_status_t) apr_socket_recvfrom(apr_sockaddr_t *from, } +#if APR_HAS_SENDFILE static apr_status_t collapse_iovec(char **off, apr_size_t *len, struct iovec *iovec, int numvec, char *buf, apr_size_t buflen) @@ -240,7 +241,6 @@ static apr_status_t collapse_iovec(char **off, apr_size_t *len, } -#if APR_HAS_SENDFILE /* * apr_status_t apr_socket_sendfile(apr_socket_t *, apr_file_t *, apr_hdtr_t *, * apr_off_t *, apr_size_t *, apr_int32_t flags) |