apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1340472 - in /apr/apr/branches/1.4.x: ./ network_io/unix/sendrecv.c
Date Sat, 19 May 2012 13:15:36 GMT
Author: sf
Date: Sat May 19 13:15:36 2012
New Revision: 1340472

URL: http://svn.apache.org/viewvc?rev=1340472&view=rev
Log:
Merge r1340470:
Hurd's sendfile works like Linux's

Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/network_io/unix/sendrecv.c

Propchange: apr/apr/branches/1.4.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1340470

Modified: apr/apr/branches/1.4.x/network_io/unix/sendrecv.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/network_io/unix/sendrecv.c?rev=1340472&r1=1340471&r2=1340472&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/network_io/unix/sendrecv.c (original)
+++ apr/apr/branches/1.4.x/network_io/unix/sendrecv.c Sat May 19 13:15:36 2012
@@ -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,



Mime
View raw message