You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by rj...@apache.org on 2013/07/13 17:58:02 UTC
svn commit: r1502809 - in /apr/apr/branches/0.9.x: ./ build/apr_network.m4
Author: rjung
Date: Sat Jul 13 15:58:01 2013
New Revision: 1502809
URL: http://svn.apache.org/r1502809
Log:
Fix broken test for O_NONBLOCK inheritance.
Followup to r1449572 resp. r1449570 (1.3.x)
resp. r1449571 (1.4.x) resp. r1449569 (1.5.x)
resp. r1449568 (trunk) which miss the variable
declaration.
Backport of r1502804 from trunk
resp. r1502805 (1.5.x) resp. r1502807 (1.4.x)
resp. r1502808 (1.3.x).
Modified:
apr/apr/branches/0.9.x/ (props changed)
apr/apr/branches/0.9.x/build/apr_network.m4
Propchange: apr/apr/branches/0.9.x/
------------------------------------------------------------------------------
Merged /apr/apr/trunk:r1502804
Modified: apr/apr/branches/0.9.x/build/apr_network.m4
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/build/apr_network.m4?rev=1502809&r1=1502808&r2=1502809&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/build/apr_network.m4 (original)
+++ apr/apr/branches/0.9.x/build/apr_network.m4 Sat Jul 13 15:58:01 2013
@@ -369,6 +369,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
@@ -389,6 +392,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) {