httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dr...@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/network_io/beos inet_aton.c networkio.h poll.c sendrecv.c sockaddr.c sockets.c sockopt.c
Date Fri, 12 May 2000 10:36:41 GMT
dreid       00/05/12 03:36:41

  Modified:    src/lib/apr/network_io/beos inet_aton.c networkio.h poll.c
                        sendrecv.c sockaddr.c sockets.c sockopt.c
  Log:
  First commit to allow Apache to build with the latest BeOS version.
  
  Revision  Changes    Path
  1.3       +4 -0      apache-2.0/src/lib/apr/network_io/beos/inet_aton.c
  
  Index: inet_aton.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/inet_aton.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- inet_aton.c	1999/12/15 13:07:26	1.2
  +++ inet_aton.c	2000/05/12 10:36:38	1.3
  @@ -68,6 +68,9 @@
    * SOFTWARE.
    */
   
  +#include "apr_private.h"
  +#ifndef HAVE_NETINET_TCP_H
  +
   #include "networkio.h"
   
   /* BeOS doesn't yet have it's own inet_aton and Bind won't be ported
  @@ -171,3 +174,4 @@
   		addr->s_addr = htonl(val);
   	return (1);
   }
  +#endif
  
  
  
  1.14      +6 -1      apache-2.0/src/lib/apr/network_io/beos/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- networkio.h	2000/04/16 16:59:37	1.13
  +++ networkio.h	2000/05/12 10:36:39	1.14
  @@ -52,9 +52,14 @@
    * <http://www.apache.org/>.
    */
   
  +#ifdef HAVE_NETINET_TCP_H
  +#include "../unix/network_io.h"
  +#else
  +
   #ifndef NETWORK_IO_H
   #define NETWORK_IO_H
   
  +
   #include <socket.h>
   #include <netdb.h>
   #include <errno.h>
  @@ -109,4 +114,4 @@
   int inet_aton(const char *cp, struct in_addr *addr);
   
   #endif  /* ! NETWORK_IO_H */
  -
  +#endif
  
  
  
  1.15      +6 -0      apache-2.0/src/lib/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- poll.c	2000/04/27 22:45:23	1.14
  +++ poll.c	2000/05/12 10:36:39	1.15
  @@ -52,6 +52,10 @@
    * <http://www.apache.org/>.
    */
   
  +#include "apr_private.h"
  +#ifdef HAVE_NETINET_TCP_H
  +#include "../unix/poll.c"
  +#else
   #include "networkio.h"
   
   /*  BeOS R4 doesn't have a poll function, but R5 will have */
  @@ -216,3 +220,5 @@
           return APR_ENOFILE;
       }
   }
  +#endif
  +
  
  
  
  1.10      +5 -1      apache-2.0/src/lib/apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sendrecv.c	2000/04/22 17:28:38	1.9
  +++ sendrecv.c	2000/05/12 10:36:39	1.10
  @@ -52,6 +52,10 @@
    * <http://www.apache.org/>.
    */
   
  +#include "apr_private.h"
  +#ifdef HAVE_NETINET_TCP_H
  +#include "../unix/sendrecv.c"
  +#else
   #include "networkio.h"
   
   static ap_status_t wait_for_io_or_timeout(ap_socket_t *sock, int for_read)
  @@ -143,4 +147,4 @@
       (*len) = rv;
       return APR_SUCCESS;
   }
  -
  +#endif
  
  
  
  1.9       +5 -0      apache-2.0/src/lib/apr/network_io/beos/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockaddr.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- sockaddr.c	2000/04/03 19:45:03	1.8
  +++ sockaddr.c	2000/05/12 10:36:39	1.9
  @@ -52,6 +52,10 @@
    * <http://www.apache.org/>.
    */
   
  +#include "apr_private.h"
  +#ifdef HAVE_NETINET_TCP_H
  +#include "../unix/sockaddr.c"
  +#else
   #include "networkio.h"
   
   ap_status_t ap_set_local_port(ap_socket_t *sock, ap_uint32_t port)
  @@ -176,3 +180,4 @@
       *name = sock->remote_addr;
       return APR_SUCCESS;
   }
  +#endif
  \ No newline at end of file
  
  
  
  1.25      +5 -0      apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- sockets.c	2000/04/22 17:28:38	1.24
  +++ sockets.c	2000/05/12 10:36:40	1.25
  @@ -52,6 +52,10 @@
    * <http://www.apache.org/>.
    */
   
  +#include "apr_private.h"
  +#ifdef HAVE_NETINET_TCP_H
  +#include "../unix/sockets.c"
  +#else
   #include "networkio.h"
   
   ap_status_t socket_cleanup(void *sock)
  @@ -231,3 +235,4 @@
       (*sock)->socketdes = *thesock;
       return APR_SUCCESS;
   }
  +#endif
  \ No newline at end of file
  
  
  
  1.16      +5 -0      apache-2.0/src/lib/apr/network_io/beos/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- sockopt.c	2000/04/14 15:58:36	1.15
  +++ sockopt.c	2000/05/12 10:36:40	1.16
  @@ -52,6 +52,10 @@
    * <http://www.apache.org/>.
    */
   
  +#include "apr_private.h"
  +#ifdef HAVE_NETINET_TCP_H
  +#include "../unix/sockopt.c"
  +#else
   #include "networkio.h"
   
   ap_status_t ap_setsocketopt(ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
  @@ -110,3 +114,4 @@
       /* on BeOS h_errno is a global... */
       return h_errno;
   }
  +#endif
  \ No newline at end of file
  
  
  

Mime
View raw message