First commit to allow Apache to build with the latest BeOS version.

git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60038 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 42 insertions, 3 deletions

diff --git a/include/arch/beos/networkio.h b/include/arch/beos/networkio.h
index 3966acf43..b37797cb7 100644
--- a/include/arch/beos/networkio.h
+++ b/include/arch/beos/networkio.h
@@ -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 @@ ap_int16_t get_event(ap_int16_t);
 int inet_aton(const char *cp, struct in_addr *addr);
 
 #endif  /* ! NETWORK_IO_H */
-
+#endif
diff --git a/network_io/beos/inet_aton.c b/network_io/beos/inet_aton.c
index 732019c11..1489487d8 100644
--- a/network_io/beos/inet_aton.c
+++ b/network_io/beos/inet_aton.c
@@ -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 @@ int inet_aton(const char *cp, struct in_addr *addr) {
 		addr->s_addr = htonl(val);
 	return (1);
 }
+#endif
diff --git a/network_io/beos/networkio.h b/network_io/beos/networkio.h
index 3966acf43..b37797cb7 100644
--- a/network_io/beos/networkio.h
+++ b/network_io/beos/networkio.h
@@ -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 @@ ap_int16_t get_event(ap_int16_t);
 int inet_aton(const char *cp, struct in_addr *addr);
 
 #endif  /* ! NETWORK_IO_H */
-
+#endif
diff --git a/network_io/beos/poll.c b/network_io/beos/poll.c
index 82e011cea..86b0a0094 100644
--- a/network_io/beos/poll.c
+++ b/network_io/beos/poll.c
@@ -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 @@ ap_status_t ap_set_polldata(ap_pollfd_t *pollfd, void *data, char *key,
         return APR_ENOFILE;
     }
 }
+#endif
+
diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c
index 2cccb0b9b..8d52f8d98 100644
--- a/network_io/beos/sendrecv.c
+++ b/network_io/beos/sendrecv.c
@@ -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 @@ ap_status_t ap_recv(ap_socket_t *sock, char *buf, ap_ssize_t *len)
     (*len) = rv;
     return APR_SUCCESS;
 }
-
+#endif
diff --git a/network_io/beos/sockaddr.c b/network_io/beos/sockaddr.c
index e880fc364..76fd25d2e 100644
--- a/network_io/beos/sockaddr.c
+++ b/network_io/beos/sockaddr.c
@@ -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 @@ ap_status_t ap_get_remote_name(struct sockaddr_in **name, const ap_socket_t *soc
     *name = sock->remote_addr;
     return APR_SUCCESS;
 }
+#endif
\ No newline at end of file
diff --git a/network_io/beos/sockets.c b/network_io/beos/sockets.c
index 5a8afa625..f6f109e20 100644
--- a/network_io/beos/sockets.c
+++ b/network_io/beos/sockets.c
@@ -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 @@ ap_status_t ap_put_os_sock(ap_socket_t **sock, ap_os_sock_t *thesock,
     (*sock)->socketdes = *thesock;
     return APR_SUCCESS;
 }
+#endif
\ No newline at end of file
diff --git a/network_io/beos/sockopt.c b/network_io/beos/sockopt.c
index 6472fe4ee..9710ff2de 100644
--- a/network_io/beos/sockopt.c
+++ b/network_io/beos/sockopt.c
@@ -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 @@ ap_status_t ap_get_remote_hostname(char **name, ap_socket_t *sock)
     /* on BeOS h_errno is a global... */
     return h_errno;
 }
+#endif
\ No newline at end of file