summaryrefslogtreecommitdiff
path: root/threadproc
diff options
context:
space:
mode:
authorrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-12-08 04:29:01 +0000
committerrbb <rbb@13f79535-47bb-0310-9956-ffa450edef68>2000-12-08 04:29:01 +0000
commitf1d59cb9e370f288335ba7d43a8c68e0be9d6d88 (patch)
tree82c65d4ed8c532522879b3aafde6833d7b9e71ff /threadproc
parent04f187c5f85e48259fe68626a6068d0b42402754 (diff)
downloadlibapr-f1d59cb9e370f288335ba7d43a8c68e0be9d6d88.tar.gz
Move apr_private.h.in from the include directory to the arch/unix
directory. This removes all temptation to include apr_private.h from outside of APR, because it just isn't available. This also highlighted a bunch of holes in our header file setup. Basically, just directories that were never migrated to the curret setup. Submitted by: Will Rowe and Ryan Bloom git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@60919 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'threadproc')
-rw-r--r--threadproc/unix/Makefile.in3
-rw-r--r--threadproc/unix/proc.c2
-rw-r--r--threadproc/unix/procsup.c2
-rw-r--r--threadproc/unix/signals.c6
-rw-r--r--threadproc/unix/thread.c2
-rw-r--r--threadproc/unix/threadpriv.c2
6 files changed, 7 insertions, 10 deletions
diff --git a/threadproc/unix/Makefile.in b/threadproc/unix/Makefile.in
index 7b157771d..ea97d6c3c 100644
--- a/threadproc/unix/Makefile.in
+++ b/threadproc/unix/Makefile.in
@@ -5,7 +5,8 @@ CFLAGS=@CFLAGS@ @OPTIM@
LIBS=@LIBS@
LDFLAGS=@LDFLAGS@ $(LIBS)
INCDIR=../../include
-INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
+DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
+INCLUDES=-I$(INCDIR) -I$(DEFOSDIR)
MKDEP=../../helpers/mkdep.sh
LIB=libthreadproc.a
diff --git a/threadproc/unix/proc.c b/threadproc/unix/proc.c
index 311b7520b..6f91f21e4 100644
--- a/threadproc/unix/proc.c
+++ b/threadproc/unix/proc.c
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "unix/threadproc.h"
+#include "threadproc.h"
#include "apr_strings.h"
#include "apr_portable.h"
diff --git a/threadproc/unix/procsup.c b/threadproc/unix/procsup.c
index 73215e4d7..e29954cda 100644
--- a/threadproc/unix/procsup.c
+++ b/threadproc/unix/procsup.c
@@ -52,7 +52,7 @@
* <http://www.apache.org/>.
*/
-#include "unix/threadproc.h"
+#include "threadproc.h"
apr_status_t apr_detach(void)
{
diff --git a/threadproc/unix/signals.c b/threadproc/unix/signals.c
index e0ce0cf2a..cd561fa82 100644
--- a/threadproc/unix/signals.c
+++ b/threadproc/unix/signals.c
@@ -52,11 +52,7 @@
* <http://www.apache.org/>.
*/
-#ifndef BEOS
-#include "unix/threadproc.h"
-#else
-#include "beos/threadproc.h"
-#endif
+#include "threadproc.h"
#include "apr_private.h"
#include "apr_lib.h"
#if APR_HAVE_SIGNAL_H
diff --git a/threadproc/unix/thread.c b/threadproc/unix/thread.c
index 896df2543..c083fb89e 100644
--- a/threadproc/unix/thread.c
+++ b/threadproc/unix/thread.c
@@ -54,7 +54,7 @@
#include "apr.h"
#include "apr_portable.h"
-#include "unix/threadproc.h"
+#include "threadproc.h"
#if APR_HAS_THREADS
diff --git a/threadproc/unix/threadpriv.c b/threadproc/unix/threadpriv.c
index cb7a995fb..9843f2e91 100644
--- a/threadproc/unix/threadpriv.c
+++ b/threadproc/unix/threadpriv.c
@@ -54,7 +54,7 @@
#include "apr.h"
#include "apr_portable.h"
-#include "unix/threadproc.h"
+#include "threadproc.h"
#if APR_HAS_THREADS