You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by tr...@locus.apache.org on 2000/06/13 23:36:18 UTC
cvs commit: apache-2.0/src/support logresolve.c
trawick 00/06/13 14:36:18
Modified: src/main http_core.c http_vhost.c util.c
src/support logresolve.c
Log:
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.
Revision Changes Path
1.73 +3 -0 apache-2.0/src/main/http_core.c
Index: http_core.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -r1.72 -r1.73
--- http_core.c 2000/06/12 23:02:49 1.72
+++ http_core.c 2000/06/13 21:36:16 1.73
@@ -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
1.20 +3 -0 apache-2.0/src/main/http_vhost.c
Index: http_vhost.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- http_vhost.c 2000/06/12 23:02:50 1.19
+++ http_vhost.c 2000/06/13 21:36:17 1.20
@@ -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
1.53 +3 -0 apache-2.0/src/main/util.c
Index: util.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/main/util.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- util.c 2000/06/12 23:02:50 1.52
+++ util.c 2000/06/13 21:36:17 1.53
@@ -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
1.9 +7 -2 apache-2.0/src/support/logresolve.c
Index: logresolve.c
===================================================================
RCS file: /home/cvs/apache-2.0/src/support/logresolve.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- logresolve.c 2000/06/12 23:03:05 1.8
+++ logresolve.c 2000/06/13 21:36:18 1.9
@@ -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
Re: cvs commit: apache-2.0/src/support logresolve.c
Posted by David Reid <dr...@jetnet.co.uk>.
Thanks. It was one of the things on my list to do as well.
david
----- Original Message -----
From: <tr...@locus.apache.org>
To: <ap...@apache.org>
Sent: Tuesday, June 13, 2000 10:36 PM
Subject: cvs commit: apache-2.0/src/support logresolve.c
> trawick 00/06/13 14:36:18
>
> Modified: src/main http_core.c http_vhost.c util.c
> src/support logresolve.c
> Log:
> 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.
>
> Revision Changes Path
> 1.73 +3 -0 apache-2.0/src/main/http_core.c
>
> Index: http_core.c
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
> retrieving revision 1.72
> retrieving revision 1.73
> diff -u -r1.72 -r1.73
> --- http_core.c 2000/06/12 23:02:49 1.72
> +++ http_core.c 2000/06/13 21:36:16 1.73
> @@ -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
>
>
>
> 1.20 +3 -0 apache-2.0/src/main/http_vhost.c
>
> Index: http_vhost.c
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/main/http_vhost.c,v
> retrieving revision 1.19
> retrieving revision 1.20
> diff -u -r1.19 -r1.20
> --- http_vhost.c 2000/06/12 23:02:50 1.19
> +++ http_vhost.c 2000/06/13 21:36:17 1.20
> @@ -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
>
>
>
> 1.53 +3 -0 apache-2.0/src/main/util.c
>
> Index: util.c
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/main/util.c,v
> retrieving revision 1.52
> retrieving revision 1.53
> diff -u -r1.52 -r1.53
> --- util.c 2000/06/12 23:02:50 1.52
> +++ util.c 2000/06/13 21:36:17 1.53
> @@ -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
>
>
>
> 1.9 +7 -2 apache-2.0/src/support/logresolve.c
>
> Index: logresolve.c
> ===================================================================
> RCS file: /home/cvs/apache-2.0/src/support/logresolve.c,v
> retrieving revision 1.8
> retrieving revision 1.9
> diff -u -r1.8 -r1.9
> --- logresolve.c 2000/06/12 23:03:05 1.8
> +++ logresolve.c 2000/06/13 21:36:18 1.9
> @@ -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
>
>
>
>
>