Get the ap_config.h cleanup working on FreeBSD by adding includes of

additional system headers.

A platform check in logresolve.c to determine whether or not we include
<arpa/inet.h> was converted to a feature check.

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

diff --git a/modules/http/http_core.c b/modules/http/http_core.c
index f2f12ceab0eac853a54b330d6d198f4f0caf2793..bf194cefe1ffb4dc11142c2d3f3f5aca69b47a64 100644 (file)
--- a/modules/http/http_core.c
+++ b/modules/http/http_core.c
@@ -76,6 +76,9 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 
 /* Allow Apache to use ap_mmap */
 #ifdef USE_MMAP_FILES

diff --git a/server/util.c b/server/util.c
index 75a149545250715e327395c691d271a0254f65b8..4ac6f7db9edb3fdf53ddc91920a41d8b1219144f 100644 (file)
--- a/server/util.c
+++ b/server/util.c
@@ -89,6 +89,9 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif

diff --git a/server/vhost.c b/server/vhost.c
index d8a5091bd9e9f481b7593de6902a73f71d60c317..0905eb63e8cb0a057cf52f7745aed61f94aa8de3 100644 (file)
--- a/server/vhost.c
+++ b/server/vhost.c
@@ -76,6 +76,9 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>
 #endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif

diff --git a/support/logresolve.c b/support/logresolve.c
index bce7bedd22dfda013f7c40fc4c5e552749322bec..d21177c36bd093ef376c772a31f0e9442313b4a9 100644 (file)
--- a/support/logresolve.c
+++ b/support/logresolve.c
@@ -47,8 +47,13 @@
 #ifdef HAVE_NETDB_H
 #include <netdb.h>
 #endif
-
-#if !defined(MPE) && !defined(BEOS) && !defined(WIN32)
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+#include <sys/socket.h>
+#endif
+#ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif