cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c
stoddard00/01/20 17:25:43 Modified:src acinclude.m4 src/include ap_ac_config.h httpd.h src/lib/apr/lib apr_snprintf.c src/lib/apr/network_io/unix networkio.h sockaddr.c Log: Back out most of the last commit. Keep APR macros seperate from Apache macros. Revision ChangesPath 1.19 +1 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /export/home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- acinclude.m4 2000/01/20 22:14:05 1.18 +++ acinclude.m4 2000/01/21 01:25:20 1.19 @@ -157,7 +157,7 @@ #ifdef HAVE_SYS_SOCKET_H #include sys/socket.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_ARPA_INET_H 1.7 +1 -1 apache-2.0/src/include/ap_ac_config.h Index: ap_ac_config.h === RCS file: /export/home/cvs/apache-2.0/src/include/ap_ac_config.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- ap_ac_config.h2000/01/20 22:14:12 1.6 +++ ap_ac_config.h2000/01/21 01:25:24 1.7 @@ -105,7 +105,7 @@ #include sys/socket.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif 1.22 +1 -1 apache-2.0/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- httpd.h 2000/01/20 22:14:15 1.21 +++ httpd.h 2000/01/21 01:25:25 1.22 @@ -81,7 +81,7 @@ #include ap.h #include ap_mmn.h -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif 1.9 +1 -1 apache-2.0/src/lib/apr/lib/apr_snprintf.c Index: apr_snprintf.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- apr_snprintf.c2000/01/20 22:14:23 1.8 +++ apr_snprintf.c2000/01/21 01:25:30 1.9 @@ -70,7 +70,7 @@ #ifdef HAVE_CTYPE_H #include ctype.h #endif -#if APR_HAVE_NETINET_IN_H +#ifdef HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_SYS_SOCKET_H 1.15 +1 -1 apache-2.0/src/lib/apr/network_io/unix/networkio.h Index: networkio.h === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- networkio.h 2000/01/20 22:14:30 1.14 +++ networkio.h 2000/01/21 01:25:34 1.15 @@ -86,7 +86,7 @@ #if HAVE_NETINET_TCP_H #include netinet/tcp.h #endif -#if APR_HAVE_NETINET_IN_H +#if HAVE_NETINET_IN_H #include netinet/in.h #endif #if HAVE_ARPA_INET_H 1.4 +1 -1 apache-2.0/src/lib/apr/network_io/unix/sockaddr.c Index: sockaddr.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sockaddr.c2000/01/20 22:14:33 1.3 +++ sockaddr.c2000/01/21 01:25:36 1.4 @@ -203,7 +203,7 @@ -#if APR_HAVE_NETINET_IN_H +#if HAVE_NETINET_IN_H /* ***APRDOC * ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *socket) *Return the local socket name as a BSD style struct sockaddr_in.
cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c
stoddard00/01/20 14:14:39 Modified:src acinclude.m4 src/include ap_ac_config.h httpd.h src/lib/apr/lib apr_snprintf.c src/lib/apr/network_io/unix networkio.h sockaddr.c Log: Convert HAVE_NETINET... to the APR mac Revision ChangesPath 1.18 +1 -1 apache-2.0/src/acinclude.m4 Index: acinclude.m4 === RCS file: /export/home/cvs/apache-2.0/src/acinclude.m4,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- acinclude.m4 2000/01/16 20:00:46 1.17 +++ acinclude.m4 2000/01/20 22:14:05 1.18 @@ -157,7 +157,7 @@ #ifdef HAVE_SYS_SOCKET_H #include sys/socket.h #endif -#ifdef HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_ARPA_INET_H 1.6 +1 -1 apache-2.0/src/include/ap_ac_config.h Index: ap_ac_config.h === RCS file: /export/home/cvs/apache-2.0/src/include/ap_ac_config.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- ap_ac_config.h2000/01/19 01:14:26 1.5 +++ ap_ac_config.h2000/01/20 22:14:12 1.6 @@ -105,7 +105,7 @@ #include sys/socket.h #endif -#ifdef HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #endif 1.21 +2 -0 apache-2.0/src/include/httpd.h Index: httpd.h === RCS file: /export/home/cvs/apache-2.0/src/include/httpd.h,v retrieving revision 1.20 retrieving revision 1.21 diff -u -r1.20 -r1.21 --- httpd.h 2000/01/19 02:41:49 1.20 +++ httpd.h 2000/01/20 22:14:15 1.21 @@ -81,7 +81,9 @@ #include ap.h #include ap_mmn.h +#if APR_HAVE_NETINET_IN_H #include netinet/in.h +#endif #ifdef CORE_PRIVATE 1.8 +1 -1 apache-2.0/src/lib/apr/lib/apr_snprintf.c Index: apr_snprintf.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/lib/apr_snprintf.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- apr_snprintf.c1999/12/14 15:28:22 1.7 +++ apr_snprintf.c2000/01/20 22:14:23 1.8 @@ -70,7 +70,7 @@ #ifdef HAVE_CTYPE_H #include ctype.h #endif -#ifdef HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #endif #ifdef HAVE_SYS_SOCKET_H 1.14 +1 -1 apache-2.0/src/lib/apr/network_io/unix/networkio.h Index: networkio.h === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- networkio.h 1999/12/29 23:56:24 1.13 +++ networkio.h 2000/01/20 22:14:30 1.14 @@ -86,7 +86,7 @@ #if HAVE_NETINET_TCP_H #include netinet/tcp.h #endif -#if HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H #include netinet/in.h #endif #if HAVE_ARPA_INET_H 1.3 +1 -1 apache-2.0/src/lib/apr/network_io/unix/sockaddr.c Index: sockaddr.c === RCS file: /export/home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- sockaddr.c1999/12/03 15:18:34 1.2 +++ sockaddr.c2000/01/20 22:14:33 1.3 @@ -203,7 +203,7 @@ -#if HAVE_NETINET_IN_H +#if APR_HAVE_NETINET_IN_H /* ***APRDOC * ap_status_t ap_get_local_name(struct sockaddr_in **name, const ap_socket_t *socket) *Return the local socket name as a BSD style struct sockaddr_in.
Re: cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c
Convert HAVE_NETINET... to the APR mac Please undo this change. APR is not providing configuration macros for Apache. That is up to Apache to do. The APR_HAVE_NETINET_H macro is defined so that the APR PUBLIC header file can use it. This macro should also not be used by APR internal files. It should only be used by header files that APR provides for other programs, such as apr_network_io.h Ryan
