Commit f1864b97 authored by Jeff Trawick's avatar Jeff Trawick
Browse files

Rely on APR to determine whether or not we have netinet/tcp.h. This test 

requires a special work-around for IRIX 6.5, which will be in APR soon.
There is no need for it in Apache.

The include of netinet/tcp.h was removed from perchild.c and threaded.c.
They no longer seem to be needed there.

PR:		6459


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88455 13f79535-47bb-0310-9956-ffa450edef68
parent 3c4c5c70

configure.in

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ string.h \ 
limits.h \

unistd.h \

sys/socket.h \

netinet/tcp.h \

pwd.h \

grp.h \

strings.h

include/mpm_common.h

+1 −1
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ 


#include "ap_config.h"



#ifdef HAVE_NETINET_TCP_H

#if APR_HAVE_NETINET_TCP_H

#include <netinet/tcp.h>    /* for TCP_NODELAY */

#endif

server/mpm/experimental/perchild/perchild.c

+0 −4
Original line number Diff line number Diff line
@@ -92,10 +92,6 @@ 
#include "scoreboard.h"

#include "util_filter.h"



#ifdef HAVE_NETINET_TCP_H

#include <netinet/tcp.h>

#endif



/* ### should be APR-ized */

#include <poll.h>

#include <grp.h>

server/mpm/perchild/perchild.c

+0 −4
Original line number Diff line number Diff line
@@ -92,10 +92,6 @@ 
#include "scoreboard.h"

#include "util_filter.h"



#ifdef HAVE_NETINET_TCP_H

#include <netinet/tcp.h>

#endif



/* ### should be APR-ized */

#include <poll.h>

#include <grp.h>

server/mpm/threaded/threaded.c

+0 −4
Original line number Diff line number Diff line
@@ -88,10 +88,6 @@ 
#include "ap_listen.h"

#include "scoreboard.h" 



#ifdef HAVE_NETINET_TCP_H

#include <netinet/tcp.h>

#endif



#include <signal.h>



/*