Move all of the threadproc private header files to an arch directory under

the include directory.  All private header files for APR are being moved.
This allows platforms that only implement some of the APR types to compile
cleanly.


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

6 files changed, 8 insertions, 111 deletions

diff --git a/threadproc/os2/Makefile.in b/threadproc/os2/Makefile.in
index 24b36196f..70c04dcce 100644
--- a/threadproc/os2/Makefile.in
+++ b/threadproc/os2/Makefile.in
@@ -8,10 +8,8 @@ RANLIB=@RANLIB@
 CFLAGS=@CFLAGS@ @OPTIM@
 LIBS=@LIBS@
 LDFLAGS=@LDFLAGS@ $(LIBS)
-INCDIR=../../inc
 INCDIR1=../../include
-INCDIR2=../../file_io/os2
-INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I.
+INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
 
 LIB=threadproc.a
 
diff --git a/threadproc/os2/proc.c b/threadproc/os2/proc.c
index 4a88675cc..68e29fab7 100644
--- a/threadproc/os2/proc.c
+++ b/threadproc/os2/proc.c
@@ -55,8 +55,8 @@
 #define INCL_DOS
 #define INCL_DOSERRORS
 
-#include "threadproc.h"
-#include "fileio.h"
+#include "os2/threadproc.h"
+#include "os2/fileio.h"
 #include "apr_private.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
diff --git a/threadproc/os2/signals.c b/threadproc/os2/signals.c
index 6efd71d18..732bd73e8 100644
--- a/threadproc/os2/signals.c
+++ b/threadproc/os2/signals.c
@@ -53,8 +53,8 @@
  */
 
 #define INCL_DOSEXCEPTIONS
-#include "threadproc.h"
-#include "fileio.h"
+#include "os2/threadproc.h"
+#include "os2/fileio.h"
 #include "apr_thread_proc.h"
 #include "apr_file_io.h"
 #include "apr_general.h"
diff --git a/threadproc/os2/thread.c b/threadproc/os2/thread.c
index 3879f6d80..5e60b817d 100644
--- a/threadproc/os2/thread.c
+++ b/threadproc/os2/thread.c
@@ -54,7 +54,7 @@
 
 #define INCL_DOSERRORS
 #define INCL_DOS
-#include "threadproc.h"
+#include "os2/threadproc.h"
 #include "apr_thread_proc.h"
 #include "apr_general.h"
 #include "apr_lib.h"
diff --git a/threadproc/os2/threadpriv.c b/threadproc/os2/threadpriv.c
index 15143e512..f038af494 100644
--- a/threadproc/os2/threadpriv.c
+++ b/threadproc/os2/threadpriv.c
@@ -52,12 +52,12 @@
  * <http://www.apache.org/>.
  */
 
-#include "threadproc.h"
+#include "os2/threadproc.h"
 #include "apr_thread_proc.h"
 #include "apr_general.h"
 #include "apr_errno.h"
 #include "apr_lib.h"
-#include "fileio.h"
+#include "os2/fileio.h"
 
 apr_status_t apr_create_thread_private(apr_threadkey_t **key,
                                      void (*dest)(void *), apr_pool_t *cont)
diff --git a/threadproc/os2/threadproc.h b/threadproc/os2/threadproc.h
deleted file mode 100644
index c14c54aa0..000000000
--- a/threadproc/os2/threadproc.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/* ====================================================================
- * The Apache Software License, Version 1.1
- *
- * Copyright (c) 2000 The Apache Software Foundation.  All rights
- * reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. The end-user documentation included with the redistribution,
- *    if any, must include the following acknowledgment:
- *       "This product includes software developed by the
- *        Apache Software Foundation (http://www.apache.org/)."
- *    Alternately, this acknowledgment may appear in the software itself,
- *    if and wherever such third-party acknowledgments normally appear.
- *
- * 4. The names "Apache" and "Apache Software Foundation" must
- *    not be used to endorse or promote products derived from this
- *    software without prior written permission. For written
- *    permission, please contact apache@apache.org.
- *
- * 5. Products derived from this software may not be called "Apache",
- *    nor may "Apache" appear in their name, without prior written
- *    permission of the Apache Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
- * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * ====================================================================
- *
- * This software consists of voluntary contributions made by many
- * individuals on behalf of the Apache Software Foundation.  For more
- * information on the Apache Software Foundation, please see
- * <http://www.apache.org/>.
- */
-
-#include "apr_thread_proc.h"
-#include "apr_file_io.h"
-
-#ifndef THREAD_PROC_H
-#define THREAD_PROC_H
-
-#define APR_THREADATTR_DETACHED 1
-
-#define SHELL_PATH "cmd.exe"
-#define APR_THREAD_STACKSIZE 65536
-
-struct apr_threadattr_t {
-    apr_pool_t *cntxt;
-    unsigned long attr;
-};
-
-struct apr_thread_t {
-    apr_pool_t *cntxt;
-    struct apr_threadattr_t *attr;
-    unsigned long tid;
-    apr_thread_start_t func;
-    void *data;
-    void *rv;
-};
-
-struct apr_threadkey_t {
-    apr_pool_t *cntxt;
-    unsigned long *key;
-};
-
-struct apr_procattr_t {
-    apr_pool_t *cntxt;
-    apr_file_t *parent_in;
-    apr_file_t *child_in;
-    apr_file_t *parent_out;
-    apr_file_t *child_out;
-    apr_file_t *parent_err;
-    apr_file_t *child_err;
-    char *currdir;
-    apr_int32_t cmdtype;
-    apr_int32_t detached;
-};
-
-typedef void (*os2_thread_start_t)(void *);
-
-#endif  /* ! THREAD_PROC_H */
-