Update the BeOS files to use a single header.

BeOS can't use the same non-blocking code as Unix for pipes, so
until I can add the appropriate code I'm commenting it out for BeOS.


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

7 files changed, 10 insertions, 35 deletions

diff --git a/network_io/beos/inet_aton.c b/network_io/beos/inet_aton.c
index ea7f15176..732019c11 100644
--- a/network_io/beos/inet_aton.c
+++ b/network_io/beos/inet_aton.c
@@ -68,8 +68,6 @@
  * SOFTWARE.
  */
 
-#include <socket.h>
-#include <stdlib.h>
 #include "networkio.h"
 
 /* BeOS doesn't yet have it's own inet_aton and Bind won't be ported
diff --git a/network_io/beos/networkio.h b/network_io/beos/networkio.h
index 6e6277f25..581b271b1 100644
--- a/network_io/beos/networkio.h
+++ b/network_io/beos/networkio.h
@@ -58,6 +58,16 @@
 
 #include <socket.h>
 #include <netdb.h>
+#include <errno.h>
+#include <string.h>
+#include <stdlib.h>
+#include <sys/time.h>
+#include "apr_network_io.h"
+#include "apr_general.h"
+#include "apr_portable.h"
+#include "apr_lib.h"
+#include "fileio.h"
+#include "apr_errno.h"
 
 /* The definition of isascii was missed from the PowerPC ctype.h
  *
diff --git a/network_io/beos/poll.c b/network_io/beos/poll.c
index da7bb4a56..9c4072d0a 100644
--- a/network_io/beos/poll.c
+++ b/network_io/beos/poll.c
@@ -55,9 +55,6 @@
 
 
 #include "networkio.h"
-#include "apr_network_io.h"
-#include "networkio.h"
-#include "apr_general.h"
 
 /*  BeOS R4 doesn't have a poll function, but R5 will have */
 /*  so for the time being we try our best with an implementaion that */
diff --git a/network_io/beos/sendrecv.c b/network_io/beos/sendrecv.c
index cb8e07a5b..4206351a2 100644
--- a/network_io/beos/sendrecv.c
+++ b/network_io/beos/sendrecv.c
@@ -55,14 +55,7 @@
  *
  */
 
-#include <sys/time.h>
-#include <socket.h>
-#include <netdb.h>
 #include "networkio.h"
-#include "fileio.h"
-#include "apr_errno.h"
-#include "apr_general.h"
-#include "apr_network_io.h"
 
 ap_status_t ap_send(struct socket_t *sock, const char *buf, ap_ssize_t *len)
 {
diff --git a/network_io/beos/sockaddr.c b/network_io/beos/sockaddr.c
index b07717df5..956d96c1b 100644
--- a/network_io/beos/sockaddr.c
+++ b/network_io/beos/sockaddr.c
@@ -54,12 +54,6 @@
  */
 
 #include "networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
-#include <errno.h>
-#include <string.h>
-#include <sys/socket.h>
 
 ap_status_t ap_set_local_port(struct socket_t *sock, ap_uint32_t port)
 {
diff --git a/network_io/beos/sockets.c b/network_io/beos/sockets.c
index 13a4d4614..0edde23f6 100644
--- a/network_io/beos/sockets.c
+++ b/network_io/beos/sockets.c
@@ -53,15 +53,7 @@
  *
  */
 
-#include <errno.h>
-#include <string.h>
-#include <socket.h>
-#include <netdb.h>
 #include "networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_portable.h"
-#include "apr_lib.h"
 
 ap_status_t socket_cleanup(void *sock)
 {
diff --git a/network_io/beos/sockopt.c b/network_io/beos/sockopt.c
index c588887c0..1dbcb9346 100644
--- a/network_io/beos/sockopt.c
+++ b/network_io/beos/sockopt.c
@@ -53,16 +53,7 @@
  *
  */
 
-#include <errno.h>
-#include <string.h>
-#include <sys/socket.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <netdb.h>
 #include "networkio.h"
-#include "apr_network_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
 
 ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
 {