apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject cvs commit: apr/network_io/unix sa_common.c
Date Tue, 12 Mar 2002 18:39:47 GMT
trawick     02/03/12 10:39:47

  Modified:    include  apr_network_io.h
               network_io/unix sa_common.c
  Log:
  There is no apparent need to expose the guts of apr_ipsubnet_t,
  so move the definition to sa_common.c, the only file that needs
  to have that information.
  
  Revision  Changes    Path
  1.118     +2 -13     apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apr/include/apr_network_io.h,v
  retrieving revision 1.117
  retrieving revision 1.118
  diff -u -r1.117 -r1.118
  --- apr_network_io.h	20 Feb 2002 23:59:07 -0000	1.117
  +++ apr_network_io.h	12 Mar 2002 18:39:47 -0000	1.118
  @@ -191,6 +191,8 @@
    */
   typedef struct apr_hdtr_t       apr_hdtr_t;
   typedef struct in_addr          apr_in_addr_t;
  +/** A structure to represent an IP subnet */
  +typedef struct apr_ipsubnet_t apr_ipsubnet_t;
   
   /** @remark use apr_uint16_t just in case some system has a short that isn't 16 bits...
*/
   typedef apr_uint16_t            apr_port_t;
  @@ -253,19 +255,6 @@
       struct iovec* trailers;
       /** number of trailers in the iovec */
       int numtrailers;
  -};
  -
  -/** A structure to represent an IP subnet */
  -typedef struct apr_ipsubnet_t apr_ipsubnet_t;
  -struct apr_ipsubnet_t {
  -    int family;
  -#if APR_HAVE_IPV6
  -    apr_uint32_t sub[4]; /* big enough for IPv4 and IPv6 addresses */
  -    apr_uint32_t mask[4];
  -#else
  -    apr_uint32_t sub[1];
  -    apr_uint32_t mask[1];
  -#endif
   };
   
   /* function definitions */
  
  
  
  1.50      +11 -0     apr/network_io/unix/sa_common.c
  
  Index: sa_common.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sa_common.c,v
  retrieving revision 1.49
  retrieving revision 1.50
  diff -u -r1.49 -r1.50
  --- sa_common.c	31 Jan 2002 13:21:32 -0000	1.49
  +++ sa_common.c	12 Mar 2002 18:39:47 -0000	1.50
  @@ -74,6 +74,17 @@
   #define APR_WANT_STRFUNC
   #include "apr_want.h"
   
  +struct apr_ipsubnet_t {
  +    int family;
  +#if APR_HAVE_IPV6
  +    apr_uint32_t sub[4]; /* big enough for IPv4 and IPv6 addresses */
  +    apr_uint32_t mask[4];
  +#else
  +    apr_uint32_t sub[1];
  +    apr_uint32_t mask[1];
  +#endif
  +};
  +
   #ifdef HAVE_SET_H_ERRNO
   #define SET_H_ERRNO(newval) set_h_errno(newval)
   #else
  
  
  

Mime
View raw message