apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1502807 - in /apr/apr/branches/1.4.x: ./ build/apr_network.m4
Date Sat, 13 Jul 2013 15:54:54 GMT
Author: rjung
Date: Sat Jul 13 15:54:54 2013
New Revision: 1502807

URL: http://svn.apache.org/r1502807
Log:
Fix broken test for O_NONBLOCK inheritance.

Followup to r1449570 resp. r1449569 (1.5.x)
resp. r1449568 (trunk) which miss the variable
declaration.

Backport of r1502804 from trunk resp. r1502805
(1.5.x).

Modified:
    apr/apr/branches/1.4.x/   (props changed)
    apr/apr/branches/1.4.x/build/apr_network.m4

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

Modified: apr/apr/branches/1.4.x/build/apr_network.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.4.x/build/apr_network.m4?rev=1502807&r1=1502806&r2=1502807&view=diff
==============================================================================
--- apr/apr/branches/1.4.x/build/apr_network.m4 (original)
+++ apr/apr/branches/1.4.x/build/apr_network.m4 Sat Jul 13 15:54:54 2013
@@ -570,6 +570,9 @@ AC_DEFUN([APR_CHECK_O_NONBLOCK_INHERITED
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
 #endif
+#ifdef HAVE_SYS_TIME_H
+#include <sys/time.h>
+#endif
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
@@ -590,6 +593,8 @@ int main(void) {
     int listen_port, rc;
     struct sockaddr_in sa;
     socklen_t sa_len;
+    fd_set fds;
+    struct timeval tv;
 
     listen_s = socket(AF_INET, SOCK_STREAM, 0);
     if (listen_s < 0) {



Mime
View raw message