Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm
Precedence: bulk
Reply-To: new-httpd@apache.org
Date: 18 Nov 2000 15:32:16 -0000
Message-ID: <20001118153216.14584.qmail@locus.apache.org>
From: dreid@locus.apache.org
To: apache-2.0-cvs@apache.org
Subject: cvs commit: apache-2.0/src/lib/apr/network_io/unix sockets.c

dreid       00/11/18 07:32:16

  Modified:    src/lib/apr/network_io/unix sockets.c
  Log:
  Hide an instance of AF_INET6 if we don't have IPv6 and start adding
  code to allow BeOS to use this file.
  
  Revision  Changes    Path
  1.58      +6 -0      apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.57
  retrieving revision 1.58
  diff -u -r1.57 -r1.58
  --- sockets.c	2000/11/17 03:45:01	1.57
  +++ sockets.c	2000/11/18 15:32:16	1.58
  @@ -58,7 +58,11 @@
   static apr_status_t socket_cleanup(void *sock)
   {
       apr_socket_t *thesocket = sock;
  +#ifndef BEOS
       if (close(thesocket->socketdes) == 0) {
  +#else
  +    if (closesocket(thesocket->socketdes) == 0) {
  +#endif
           thesocket->socketdes = -1;
           return APR_SUCCESS;
       }
  @@ -246,6 +250,7 @@
               sock->local_port_unknown = 1;
           }
           /* XXX IPv6 to be handled better later... */
  +#if APR_HAVE_IPV6
           if (sock->local_addr->sa.sin.sin_family == AF_INET6 ||
               sock->local_addr->sa.sin.sin_addr.s_addr == 0) {
               /* not bound to specific local interface; connect() had to assign
  @@ -253,6 +258,7 @@
                */
               sock->local_interface_unknown = 1;
           }
  +#endif
   #ifndef HAVE_POLL
           sock->connected=1;
   #endif