From: Jeff Trawick <trawick@apache.org>
Date: Tue, 13 Jun 2000 21:36:18 +0000 (+0000)
Subject: Get the ap_config.h cleanup working on FreeBSD by adding includes of
X-Git-Tag: APACHE_2_0_ALPHA_5~333
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9746375cfdb85a190df8277959844f66d69c372;p=apache

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 f2f12ceab0..bf194cefe1 100644
--- 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 75a1495452..4ac6f7db9e 100644
--- 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 d8a5091bd9..0905eb63e8 100644
--- 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 bce7bedd22..d21177c36b 100644
--- 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