httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@hyperreal.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/unix networkio.h sockaddr.c
Date Fri, 21 Jan 2000 01:25:46 GMT
stoddard    00/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  Changes    Path
  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.h	2000/01/20 22:14:12	1.6
  +++ ap_ac_config.h	2000/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.c	2000/01/20 22:14:23	1.8
  +++ apr_snprintf.c	2000/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.c	2000/01/20 22:14:33	1.3
  +++ sockaddr.c	2000/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.
  
  
  

Mime
View raw message