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, 7 insertions, 29 deletions

diff --git a/threadproc/beos/proc.c b/threadproc/beos/proc.c
index dd5cebfc6..9b50bc0c6 100644
--- a/threadproc/beos/proc.c
+++ b/threadproc/beos/proc.c
@@ -54,14 +54,7 @@
  */
 
 
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
 #include "threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_portable.h"
 
 struct send_pipe {
 	int in;
diff --git a/threadproc/beos/procsup.c b/threadproc/beos/procsup.c
index 5d14c9622..9fc531cdf 100644
--- a/threadproc/beos/procsup.c
+++ b/threadproc/beos/procsup.c
@@ -54,13 +54,6 @@
  */
 
 #include "threadproc.h"
-#include "fileio.h"
-
-#include "apr_config.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include "apr_lib.h"
 
 ap_status_t ap_detach(struct proc_t **new, ap_context_t *cont)
 {
diff --git a/threadproc/beos/signals.c b/threadproc/beos/signals.c
index 014964230..a6594e47f 100644
--- a/threadproc/beos/signals.c
+++ b/threadproc/beos/signals.c
@@ -54,13 +54,6 @@
  */
 
 #include "threadproc.h"
-#include "fileio.h"
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-#include "apr_general.h"
-#include <signal.h>
-#include <string.h>
-#include <sys/wait.h>
 
 ap_status_t ap_kill(struct proc_t *proc, int signal)
 {
diff --git a/threadproc/beos/thread.c b/threadproc/beos/thread.c
index 7cb98ca20..d27e322e6 100644
--- a/threadproc/beos/thread.c
+++ b/threadproc/beos/thread.c
@@ -54,9 +54,6 @@
  */
 
 #include "threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-
 
 ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
 {
diff --git a/threadproc/beos/threadcancel.c b/threadproc/beos/threadcancel.c
index 4d5022fdb..86a89d09d 100644
--- a/threadproc/beos/threadcancel.c
+++ b/threadproc/beos/threadcancel.c
@@ -54,8 +54,6 @@
  */
 
 #include "threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
 
 
 ap_status_t ap_cancel_thread(struct thread_t *thd)
diff --git a/threadproc/beos/threadpriv.c b/threadproc/beos/threadpriv.c
index 7491d1225..c436afd25 100644
--- a/threadproc/beos/threadpriv.c
+++ b/threadproc/beos/threadpriv.c
@@ -54,9 +54,6 @@
  */
 
 #include "threadproc.h"
-#include "apr_thread_proc.h"
-#include "apr_general.h"
-#include "apr_errno.h"
 
 static struct beos_key key_table[BEOS_MAX_DATAKEYS];
 static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
diff --git a/threadproc/beos/threadproc.h b/threadproc/beos/threadproc.h
index ccdb720ba..62e99ff69 100644
--- a/threadproc/beos/threadproc.h
+++ b/threadproc/beos/threadproc.h
@@ -56,7 +56,14 @@
 #include "apr_thread_proc.h"
 #include "fileio.h"
 #include "apr_file_io.h"
+#include "apr_thread_proc.h"
+#include "apr_file_io.h"
+#include "apr_general.h"
+#include "apr_portable.h"
 #include  <kernel/OS.h>
+#include <signal.h>
+#include <string.h>
+#include <sys/wait.h>
 
 #ifndef THREAD_PROC_H
 #define THREAD_PROC_H