summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsf <sf@13f79535-47bb-0310-9956-ffa450edef68>2012-05-19 13:15:36 +0000
committersf <sf@13f79535-47bb-0310-9956-ffa450edef68>2012-05-19 13:15:36 +0000
commit89e938115ee900f0ddeb1b046f73fd767a16f1f7 (patch)
tree0a976710b05e4f4797531684c662370bc3b7f748
parent33a7b8a21f02f5b2e717c38adb5a7e4b53cf5bbb (diff)
downloadlibapr-89e938115ee900f0ddeb1b046f73fd767a16f1f7.tar.gz
Merge r1340470:
Hurd's sendfile works like Linux's git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@1340472 13f79535-47bb-0310-9956-ffa450edef68
-rw-r--r--network_io/unix/sendrecv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/network_io/unix/sendrecv.c b/network_io/unix/sendrecv.c
index c133a26d9..6f5ec5030 100644
--- a/network_io/unix/sendrecv.c
+++ b/network_io/unix/sendrecv.c
@@ -245,7 +245,7 @@ do_select:
/* Define a structure to pass in when we have a NULL header value */
static apr_hdtr_t no_hdtr;
-#if defined(__linux__) && defined(HAVE_WRITEV)
+#if (defined(__linux__) || defined(__GNU__)) && defined(HAVE_WRITEV)
apr_status_t apr_socket_sendfile(apr_socket_t *sock, apr_file_t *file,
apr_hdtr_t *hdtr, apr_off_t *offset,