apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thom...@apache.org
Subject cvs commit: apr/user/win32 userinfo.c
Date Mon, 06 Jan 2003 23:44:41 GMT
thommay     2003/01/06 15:44:40

  Modified:    build    NWGNUenvironment.inc
               dso/aix  dso.c
               dso/beos dso.c
               dso/netware dso.c
               dso/os2  dso.c
               dso/os390 dso.c
               dso/unix dso.c
               dso/win32 dso.c
               file_io/netware filestat.c filesys.c flock.c pipe.c
               file_io/os2 dir.c filedup.c filestat.c filesys.c flock.c
                        maperrorcode.c open.c pipe.c readwrite.c seek.c
               file_io/unix copy.c dir.c fileacc.c filedup.c filepath.c
                        filestat.c flock.c mktemp.c open.c pipe.c
                        readwrite.c seek.c
               file_io/win32 dir.c filedup.c filepath.c filestat.c
                        filesys.c flock.c open.c pipe.c readwrite.c seek.c
               locks/beos proc_mutex.c thread_cond.c thread_mutex.c
                        thread_rwlock.c
               locks/netware proc_mutex.c thread_cond.c thread_mutex.c
                        thread_rwlock.c
               locks/os2 proc_mutex.c thread_cond.c thread_mutex.c
                        thread_rwlock.c
               locks/unix global_mutex.c proc_mutex.c thread_cond.c
                        thread_mutex.c thread_rwlock.c
               locks/win32 proc_mutex.c thread_cond.c thread_mutex.c
                        thread_rwlock.c
               misc/netware start.c
               misc/unix errorcodes.c getopt.c otherchild.c rand.c start.c
               misc/win32 apr_app.c internal.c misc.c rand.c start.c utf8.c
               mmap/unix mmap.c
               mmap/win32 mmap.c
               network_io/beos sendrecv.c
               network_io/os2 os2calls.c sendrecv.c sendrecv_udp.c
                        sockets.c sockopt.c
               network_io/unix inet_ntop.c inet_pton.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               network_io/win32 sendrecv.c sockets.c sockopt.c
               poll/os2 poll.c pollset.c
               poll/unix poll.c pollacc.c
               shmem/unix shm.c
               shmem/win32 shm.c
               support/unix waitio.c
               test/internal testucs.c
               threadproc/beos proc.c thread.c threadpriv.c
               threadproc/netware proc.c procsup.c signals.c thread.c
                        threadpriv.c
               threadproc/os2 proc.c thread.c threadpriv.c
               threadproc/unix proc.c procsup.c signals.c thread.c
                        threadpriv.c
               threadproc/win32 proc.c signals.c thread.c threadpriv.c
               time/unix time.c
               time/win32 access.c time.c timestr.c
               user/win32 userinfo.c
  Added:       include/arch/aix apr_arch_dso.h
               include/arch/beos apr_arch_dso.h apr_arch_proc_mutex.h
                        apr_arch_thread_cond.h apr_arch_thread_mutex.h
                        apr_arch_thread_rwlock.h apr_arch_threadproc.h
               include/arch/netware apr_arch_dso.h apr_arch_fileio.h
                        apr_arch_global_mutex.h apr_arch_internal_time.h
                        apr_arch_networkio.h apr_arch_pre_nw.h
                        apr_arch_proc_mutex.h apr_arch_thread_cond.h
                        apr_arch_thread_mutex.h apr_arch_thread_rwlock.h
                        apr_arch_threadproc.h
               include/arch/os2 apr_arch_dso.h apr_arch_fileio.h
                        apr_arch_networkio.h apr_arch_os2calls.h
                        apr_arch_proc_mutex.h apr_arch_thread_cond.h
                        apr_arch_thread_mutex.h apr_arch_thread_rwlock.h
                        apr_arch_threadproc.h
               include/arch/os390 apr_arch_dso.h
               include/arch/unix apr_arch_dso.h apr_arch_fileio.h
                        apr_arch_global_mutex.h apr_arch_inherit.h
                        apr_arch_internal_time.h apr_arch_misc.h
                        apr_arch_networkio.h apr_arch_proc_mutex.h
                        apr_arch_shm.h apr_arch_thread_cond.h
                        apr_arch_thread_mutex.h apr_arch_thread_rwlock.h
                        apr_arch_threadproc.h
               include/arch/win32 apr_arch_atime.h apr_arch_dso.h
                        apr_arch_fileio.h apr_arch_inherit.h
                        apr_arch_misc.h apr_arch_networkio.h
                        apr_arch_proc_mutex.h apr_arch_thread_cond.h
                        apr_arch_thread_mutex.h apr_arch_thread_rwlock.h
                        apr_arch_threadproc.h apr_arch_utf8.h
  Removed:     include/arch/aix dso.h
               include/arch/beos dso.h proc_mutex.h thread_cond.h
                        thread_mutex.h thread_rwlock.h threadproc.h
               include/arch/netware dso.h fileio.h global_mutex.h
                        internal_time.h networkio.h pre_nw.h proc_mutex.h
                        thread_cond.h thread_mutex.h thread_rwlock.h
                        threadproc.h
               include/arch/os2 dso.h fileio.h networkio.h os2calls.h
                        proc_mutex.h thread_cond.h thread_mutex.h
                        thread_rwlock.h threadproc.h
               include/arch/os390 dso.h
               include/arch/unix dso.h fileio.h global_mutex.h inherit.h
                        internal_time.h misc.h networkio.h proc_mutex.h
                        shm.h thread_cond.h thread_mutex.h thread_rwlock.h
                        threadproc.h
               include/arch/win32 atime.h dso.h fileio.h inherit.h misc.h
                        networkio.h proc_mutex.h thread_cond.h
                        thread_mutex.h thread_rwlock.h threadproc.h utf8.h
  Log:
  Namespace protection for include/arch/ header files
  aix/dso.h -> -> aix/apr_arch_dso.h
  beos/dso.h -> beos/apr_arch_dso.h
  beos/proc_mutex.h -> beos/apr_arch_proc_mutex.h
  beos/thread_cond.h -> beos/apr_arch_thread_cond.h
  beos/thread_mutex.h -> beos/apr_arch_thread_mutex.h
  beos/threadproc.h -> beos/apr_arch_threadproc.h
  beos/thread_rwlock.h -> beos/apr_arch_thread_rwlock.h
  netware/dso.h -> -> netware/apr_arch_dso.h
  netware/fileio.h -> -> netware/apr_arch_fileio.h
  netware/global_mutex.h -> netware/apr_arch_global_mutex.h
  netware/internal_time.h -> netware/apr_arch_internal_time.h
  netware/networkio.h -> netware/apr_arch_networkio.h
  netware/pre_nw.h -> netware/apr_arch_pre_nw.h
  netware/proc_mutex.h -> netware/apr_arch_proc_mutex.h
  netware/thread_cond.h -> netware/apr_arch_thread_cond.h
  netware/thread_mutex.h -> netware/apr_arch_thread_mutex.h
  netware/threadproc.h -> netware/apr_arch_threadproc.h
  netware/thread_rwlock.h -> netware/apr_arch_thread_rwlock.h
  os2/dso.h -> os2/apr_arch_dso.h
  os2/fileio.h -> os2/apr_arch_fileio.h
  os2/networkio.h -> os2/apr_arch_networkio.h
  os2/os2calls.h -> os2/apr_arch_os2calls.h
  os2/proc_mutex.h -> os2/apr_arch_proc_mutex.h
  os2/thread_cond.h -> os2/apr_arch_thread_cond.h
  os2/thread_mutex.h -> os2/apr_arch_thread_mutex.h
  os2/threadproc.h -> os2/apr_arch_threadproc.h
  os2/thread_rwlock.h -> os2/apr_arch_thread_rwlock.h
  os390/dso.h -> os390/apr_arch_dso.h
  unix/dso.h -> unix/apr_arch_dso.h
  unix/fileio.h -> unix/apr_arch_fileio.h
  unix/global_mutex.h -> unix/apr_arch_global_mutex.h
  unix/inherit.h -> unix/apr_arch_inherit.h
  unix/internal_time.h -> unix/apr_arch_internal_time.h
  unix/misc.h -> unix/apr_arch_misc.h
  unix/networkio.h -> unix/apr_arch_networkio.h
  unix/proc_mutex.h -> unix/apr_arch_proc_mutex.h
  unix/shm.h -> unix/apr_arch_shm.h
  unix/thread_cond.h -> unix/apr_arch_thread_cond.h
  unix/thread_mutex.h -> unix/apr_arch_thread_mutex.h
  unix/threadproc.h -> unix/apr_arch_threadproc.h
  unix/thread_rwlock.h -> unix/apr_arch_thread_rwlock.h
  win32/atime.h -> win32/apr_arch_atime.h
  win32/dso.h -> win32/apr_arch_dso.h
  win32/fileio.h -> win32/apr_arch_fileio.h
  win32/inherit.h -> win32/apr_arch_inherit.h
  win32/misc.h -> win32/apr_arch_misc.h
  win32/networkio.h -> win32/apr_arch_networkio.h
  win32/proc_mutex.h -> win32/apr_arch_proc_mutex.h
  win32/thread_cond.h -> win32/apr_arch_thread_cond.h
  win32/thread_mutex.h -> win32/apr_arch_thread_mutex.h
  win32/threadproc.h -> win32/apr_arch_threadproc.h
  win32/thread_rwlock.h -> win32/apr_arch_thread_rwlock.h
  win32/utf8.h -> win32/apr_arch_utf8.h
  
  Revision  Changes    Path
  1.8       +2 -2      apr/build/NWGNUenvironment.inc
  
  Index: NWGNUenvironment.inc
  ===================================================================
  RCS file: /home/cvs/apr/build/NWGNUenvironment.inc,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- NWGNUenvironment.inc	18 Dec 2002 16:07:35 -0000	1.7
  +++ NWGNUenvironment.inc	6 Jan 2003 23:44:15 -0000	1.8
  @@ -152,9 +152,9 @@
   CFLAGS += -O4,p
   endif
   
  -# -prefix pre_nw.h      #include pre_nw.h for all files
  +# -prefix apr_arch_pre_nw.h      #include pre_nw.h for all files
   
  -CFLAGS += -prefix pre_nw.h
  +CFLAGS += -prefix apr_arch_pre_nw.h
   
   
   PATH:=$(PATH);$(METROWERKS)\bin;$(METROWERKS)\Other Metrowerks Tools\Command Line Tools
  
  
  
  1.20      +1 -1      apr/dso/aix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/aix/dso.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- dso.c	1 Jan 2003 00:01:41 -0000	1.19
  +++ dso.c	6 Jan 2003 23:44:15 -0000	1.20
  @@ -87,7 +87,7 @@
   #include <sys/types.h>
   #include <sys/ldr.h>
   #include <a.out.h>
  -#include "dso.h"
  +#include "apr_arch_dso.h"
   #include "apr_portable.h"
   
   #if APR_HAS_DSO
  
  
  
  1.24      +1 -1      apr/dso/beos/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/beos/dso.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- dso.c	1 Jan 2003 00:01:42 -0000	1.23
  +++ dso.c	6 Jan 2003 23:44:16 -0000	1.24
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "beos/dso.h"
  +#include "beos/apr_arch_dso.h"
   #include "apr_portable.h"
   
   #if APR_HAS_DSO
  
  
  
  1.6       +1 -1      apr/dso/netware/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/netware/dso.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- dso.c	1 Jan 2003 00:01:42 -0000	1.5
  +++ dso.c	6 Jan 2003 23:44:16 -0000	1.6
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "dso.h"
  +#include "apr_arch_dso.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.29      +1 -1      apr/dso/os2/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/os2/dso.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- dso.c	1 Jan 2003 00:01:42 -0000	1.28
  +++ dso.c	6 Jan 2003 23:44:16 -0000	1.29
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "dso.h"
  +#include "apr_arch_dso.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   #include <stdio.h>
  
  
  
  1.12      +1 -1      apr/dso/os390/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/os390/dso.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- dso.c	1 Jan 2003 00:01:42 -0000	1.11
  +++ dso.c	6 Jan 2003 23:44:16 -0000	1.12
  @@ -54,7 +54,7 @@
   
   #include "apr_portable.h"
   #include "apr_strings.h"
  -#include "dso.h"
  +#include "apr_arch_dso.h"
   #include <errno.h>
   #include <string.h>
   
  
  
  
  1.60      +1 -1      apr/dso/unix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/unix/dso.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- dso.c	1 Jan 2003 00:01:42 -0000	1.59
  +++ dso.c	6 Jan 2003 23:44:16 -0000	1.60
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "dso.h"
  +#include "apr_arch_dso.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.35      +3 -3      apr/dso/win32/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apr/dso/win32/dso.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- dso.c	1 Jan 2003 00:01:42 -0000	1.34
  +++ dso.c	6 Jan 2003 23:44:16 -0000	1.35
  @@ -52,11 +52,11 @@
    * <http://www.apache.org/>.
    */
   
  -#include "dso.h"
  +#include "apr_arch_dso.h"
   #include "apr_strings.h"
   #include "apr_private.h"
  -#include "fileio.h"
  -#include "utf8.h"
  +#include "apr_arch_fileio.h"
  +#include "apr_arch_utf8.h"
   
   #if APR_HAS_DSO
   
  
  
  
  1.23      +1 -1      apr/file_io/netware/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/netware/filestat.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- filestat.c	6 Jan 2003 19:15:40 -0000	1.22
  +++ filestat.c	6 Jan 2003 23:44:16 -0000	1.23
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "fsio.h"
   #include "nks/dirio.h"
   #include "apr_file_io.h"
  
  
  
  1.7       +1 -1      apr/file_io/netware/filesys.c
  
  Index: filesys.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/netware/filesys.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- filesys.c	1 Jan 2003 00:01:42 -0000	1.6
  +++ filesys.c	6 Jan 2003 23:44:17 -0000	1.7
  @@ -53,7 +53,7 @@
    */
   
   #include "apr.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   
   apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p)
  
  
  
  1.6       +1 -1      apr/file_io/netware/flock.c
  
  Index: flock.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/netware/flock.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- flock.c	1 Jan 2003 00:01:42 -0000	1.5
  +++ flock.c	6 Jan 2003 23:44:17 -0000	1.6
  @@ -53,7 +53,7 @@
    */
   
   #include <nks/fsio.h>
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   
   apr_status_t apr_file_lock(apr_file_t *thefile, int type)
  
  
  
  1.15      +1 -1      apr/file_io/netware/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/netware/pipe.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- pipe.c	1 Jan 2003 00:01:42 -0000	1.14
  +++ pipe.c	6 Jan 2003 23:44:17 -0000	1.15
  @@ -56,7 +56,7 @@
   #include <nks/fsio.h>
   #include <nks/errno.h>
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.34      +1 -1      apr/file_io/os2/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/dir.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- dir.c	1 Jan 2003 00:01:42 -0000	1.33
  +++ dir.c	6 Jan 2003 23:44:17 -0000	1.34
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_strings.h"
  
  
  
  1.31      +2 -2      apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/filedup.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- filedup.c	1 Jan 2003 00:01:42 -0000	1.30
  +++ filedup.c	6 Jan 2003 23:44:17 -0000	1.31
  @@ -52,12 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_strings.h"
   #include <string.h>
  -#include "inherit.h"
  +#include "apr_arch_inherit.h"
   
   static apr_status_t file_dup(apr_file_t **new_file, apr_file_t *old_file, apr_pool_t *p)
   {
  
  
  
  1.33      +1 -1      apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/filestat.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- filestat.c	2 Jan 2003 09:33:15 -0000	1.32
  +++ filestat.c	6 Jan 2003 23:44:17 -0000	1.33
  @@ -54,7 +54,7 @@
   
   #define INCL_DOS
   #define INCL_DOSERRORS
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include <sys/time.h>
  
  
  
  1.7       +1 -1      apr/file_io/os2/filesys.c
  
  Index: filesys.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/filesys.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- filesys.c	1 Jan 2003 00:01:42 -0000	1.6
  +++ filesys.c	6 Jan 2003 23:44:17 -0000	1.7
  @@ -53,7 +53,7 @@
    */
   
   #include "apr.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
   #include <ctype.h>
  
  
  
  1.7       +1 -1      apr/file_io/os2/flock.c
  
  Index: flock.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/flock.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- flock.c	1 Jan 2003 00:01:42 -0000	1.6
  +++ flock.c	6 Jan 2003 23:44:17 -0000	1.7
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
   {
  
  
  
  1.16      +1 -1      apr/file_io/os2/maperrorcode.c
  
  Index: maperrorcode.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/maperrorcode.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- maperrorcode.c	1 Jan 2003 00:01:42 -0000	1.15
  +++ maperrorcode.c	6 Jan 2003 23:44:17 -0000	1.16
  @@ -53,7 +53,7 @@
    */
   
   #define INCL_DOSERRORS
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include <errno.h>
   #include <string.h>
  
  
  
  1.57      +2 -2      apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/open.c,v
  retrieving revision 1.56
  retrieving revision 1.57
  diff -u -r1.56 -r1.57
  --- open.c	1 Jan 2003 00:01:42 -0000	1.56
  +++ open.c	6 Jan 2003 23:44:17 -0000	1.57
  @@ -52,12 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_portable.h"
   #include "apr_strings.h"
  -#include "inherit.h"
  +#include "apr_arch_inherit.h"
   #include <string.h>
   
   apr_status_t apr_file_cleanup(void *thefile)
  
  
  
  1.39      +1 -1      apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/pipe.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- pipe.c	1 Jan 2003 00:01:42 -0000	1.38
  +++ pipe.c	6 Jan 2003 23:44:17 -0000	1.39
  @@ -53,7 +53,7 @@
    */
   
   #define INCL_DOSERRORS
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.55      +1 -1      apr/file_io/os2/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/readwrite.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- readwrite.c	2 Jan 2003 09:52:19 -0000	1.54
  +++ readwrite.c	6 Jan 2003 23:44:17 -0000	1.55
  @@ -55,7 +55,7 @@
   #define INCL_DOS
   #define INCL_DOSERRORS
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_strings.h"
  
  
  
  1.24      +1 -1      apr/file_io/os2/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/os2/seek.c,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- seek.c	1 Jan 2003 00:01:43 -0000	1.23
  +++ seek.c	6 Jan 2003 23:44:18 -0000	1.24
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include <string.h>
  
  
  
  1.6       +1 -1      apr/file_io/unix/copy.c
  
  Index: copy.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/copy.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- copy.c	1 Jan 2003 00:01:43 -0000	1.5
  +++ copy.c	6 Jan 2003 23:44:18 -0000	1.6
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   
   static apr_status_t apr_file_transfer_contents(const char *from_path,
  
  
  
  1.74      +1 -1      apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/dir.c,v
  retrieving revision 1.73
  retrieving revision 1.74
  diff -u -r1.73 -r1.74
  --- dir.c	1 Jan 2003 00:01:43 -0000	1.73
  +++ dir.c	6 Jan 2003 23:44:18 -0000	1.74
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   #if APR_HAVE_SYS_SYSLIMITS_H
  
  
  
  1.55      +1 -1      apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -r1.54 -r1.55
  --- fileacc.c	1 Jan 2003 00:01:43 -0000	1.54
  +++ fileacc.c	6 Jan 2003 23:44:18 -0000	1.55
  @@ -53,7 +53,7 @@
    */
   
   #include "apr_strings.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   /* A file to put ALL of the accessor functions for apr_file_t types. */
   
  
  
  
  1.52      +2 -2      apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/filedup.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- filedup.c	1 Jan 2003 00:01:43 -0000	1.51
  +++ filedup.c	6 Jan 2003 23:44:18 -0000	1.52
  @@ -52,11 +52,11 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   #include "apr_thread_mutex.h"
  -#include "inherit.h"
  +#include "apr_arch_inherit.h"
   
   static apr_status_t _file_dup(apr_file_t **new_file, 
                                 apr_file_t *old_file, apr_pool_t *p,
  
  
  
  1.19      +1 -1      apr/file_io/unix/filepath.c
  
  Index: filepath.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/filepath.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- filepath.c	3 Jan 2003 09:05:28 -0000	1.18
  +++ filepath.c	6 Jan 2003 23:44:19 -0000	1.19
  @@ -53,7 +53,7 @@
    */
   
   #include "apr.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_strings.h"
   #define APR_WANT_STRFUNC
  
  
  
  1.63      +1 -1      apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/filestat.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- filestat.c	1 Jan 2003 00:01:43 -0000	1.62
  +++ filestat.c	6 Jan 2003 23:44:19 -0000	1.63
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  
  
  
  1.9       +1 -1      apr/file_io/unix/flock.c
  
  Index: flock.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/flock.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- flock.c	1 Jan 2003 00:01:43 -0000	1.8
  +++ flock.c	6 Jan 2003 23:44:19 -0000	1.9
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   #if APR_HAVE_FCNTL_H
   #include <fcntl.h>
  
  
  
  1.26      +1 -1      apr/file_io/unix/mktemp.c
  
  Index: mktemp.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/mktemp.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- mktemp.c	1 Jan 2003 00:01:43 -0000	1.25
  +++ mktemp.c	6 Jan 2003 23:44:19 -0000	1.26
  @@ -87,7 +87,7 @@
   #include "apr_private.h"
   #include "apr_file_io.h" /* prototype of apr_mkstemp() */
   #include "apr_strings.h" /* prototype of apr_mkstemp() */
  -#include "fileio.h" /* prototype of apr_mkstemp() */
  +#include "apr_arch_fileio.h" /* prototype of apr_mkstemp() */
   #include "apr_portable.h" /* for apr_os_file_put() */
   
   #ifndef HAVE_MKSTEMP
  
  
  
  1.107     +2 -2      apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/open.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- open.c	6 Jan 2003 19:15:39 -0000	1.106
  +++ open.c	6 Jan 2003 23:44:19 -0000	1.107
  @@ -52,11 +52,11 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   #include "apr_thread_mutex.h"
  -#include "inherit.h"
  +#include "apr_arch_inherit.h"
   
   #ifdef NETWARE
   #include "nks/dirio.h"
  
  
  
  1.60      +1 -1      apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/pipe.c,v
  retrieving revision 1.59
  retrieving revision 1.60
  diff -u -r1.59 -r1.60
  --- pipe.c	1 Jan 2003 00:01:43 -0000	1.59
  +++ pipe.c	6 Jan 2003 23:44:19 -0000	1.60
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.83      +1 -1      apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.82
  retrieving revision 1.83
  diff -u -r1.82 -r1.83
  --- readwrite.c	1 Jan 2003 00:01:43 -0000	1.82
  +++ readwrite.c	6 Jan 2003 23:44:20 -0000	1.83
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_thread_mutex.h"
   #include "apr_support.h"
  
  
  
  1.29      +1 -1      apr/file_io/unix/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/unix/seek.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- seek.c	1 Jan 2003 00:01:43 -0000	1.28
  +++ seek.c	6 Jan 2003 23:44:20 -0000	1.29
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
   {
  
  
  
  1.69      +2 -2      apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/dir.c,v
  retrieving revision 1.68
  retrieving revision 1.69
  diff -u -r1.68 -r1.69
  --- dir.c	1 Jan 2003 00:01:44 -0000	1.68
  +++ dir.c	6 Jan 2003 23:44:20 -0000	1.69
  @@ -53,11 +53,11 @@
    */
   
   #include "apr.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  -#include "atime.h"
  +#include "apr_arch_atime.h"
   
   #if APR_HAVE_ERRNO_H
   #include <errno.h>
  
  
  
  1.53      +2 -2      apr/file_io/win32/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filedup.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- filedup.c	1 Jan 2003 00:01:44 -0000	1.52
  +++ filedup.c	6 Jan 2003 23:44:20 -0000	1.53
  @@ -52,12 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/fileio.h"
  +#include "win32/apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_strings.h"
   #include <string.h>
  -#include "inherit.h"
  +#include "apr_arch_inherit.h"
   
   APR_DECLARE(apr_status_t) apr_file_dup(apr_file_t **new_file,
                                          apr_file_t *old_file, apr_pool_t *p)
  
  
  
  1.35      +1 -1      apr/file_io/win32/filepath.c
  
  Index: filepath.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filepath.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- filepath.c	3 Jan 2003 09:05:28 -0000	1.34
  +++ filepath.c	6 Jan 2003 23:44:20 -0000	1.35
  @@ -53,7 +53,7 @@
    */
   
   #include "apr.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
   #include <string.h>
  
  
  
  1.76      +3 -3      apr/file_io/win32/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filestat.c,v
  retrieving revision 1.75
  retrieving revision 1.76
  diff -u -r1.75 -r1.76
  --- filestat.c	1 Jan 2003 00:01:44 -0000	1.75
  +++ filestat.c	6 Jan 2003 23:44:21 -0000	1.76
  @@ -55,15 +55,15 @@
   #include "apr.h"
   #include <aclapi.h>
   #include "apr_private.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_strings.h"
   #include "apr_errno.h"
   #include "apr_time.h"
   #include <sys/stat.h>
  -#include "atime.h"
  -#include "misc.h"
  +#include "apr_arch_atime.h"
  +#include "apr_arch_misc.h"
   
   /* We have to assure that the file name contains no '*'s, or other
    * wildcards when using FindFirstFile to recover the true file name.
  
  
  
  1.10      +1 -1      apr/file_io/win32/filesys.c
  
  Index: filesys.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/filesys.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- filesys.c	1 Jan 2003 00:01:44 -0000	1.9
  +++ filesys.c	6 Jan 2003 23:44:21 -0000	1.10
  @@ -53,7 +53,7 @@
    */
   
   #include "apr.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   
   /* Win32 Exceptions:
  
  
  
  1.13      +1 -1      apr/file_io/win32/flock.c
  
  Index: flock.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/flock.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- flock.c	1 Jan 2003 00:01:44 -0000	1.12
  +++ flock.c	6 Jan 2003 23:44:21 -0000	1.13
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   APR_DECLARE(apr_status_t) apr_file_lock(apr_file_t *thefile, int type)
   {
  
  
  
  1.116     +3 -3      apr/file_io/win32/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/open.c,v
  retrieving revision 1.115
  retrieving revision 1.116
  diff -u -r1.115 -r1.116
  --- open.c	1 Jan 2003 00:01:44 -0000	1.115
  +++ open.c	6 Jan 2003 23:44:21 -0000	1.116
  @@ -53,7 +53,7 @@
    */
   
   #include "apr_private.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  @@ -67,8 +67,8 @@
   #if APR_HAVE_SYS_STAT_H
   #include <sys/stat.h>
   #endif
  -#include "misc.h"
  -#include "inherit.h"
  +#include "apr_arch_misc.h"
  +#include "apr_arch_inherit.h"
   
   #if APR_HAS_UNICODE_FS
   apr_status_t utf8_to_unicode_path(apr_wchar_t* retstr, apr_size_t retlen, 
  
  
  
  1.48      +2 -2      apr/file_io/win32/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/pipe.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- pipe.c	1 Jan 2003 00:01:44 -0000	1.47
  +++ pipe.c	6 Jan 2003 23:44:21 -0000	1.48
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/fileio.h"
  +#include "win32/apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  @@ -67,7 +67,7 @@
   #if APR_HAVE_SYS_STAT_H
   #include <sys/stat.h>
   #endif
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   
   APR_DECLARE(apr_status_t) apr_file_pipe_timeout_set(apr_file_t *thepipe, apr_interval_time_t timeout)
   {
  
  
  
  1.75      +3 -3      apr/file_io/win32/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/readwrite.c,v
  retrieving revision 1.74
  retrieving revision 1.75
  diff -u -r1.74 -r1.75
  --- readwrite.c	1 Jan 2003 00:01:44 -0000	1.74
  +++ readwrite.c	6 Jan 2003 23:44:21 -0000	1.75
  @@ -52,15 +52,15 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/fileio.h"
  +#include "win32/apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
   #include "apr_errno.h"
   #include <malloc.h>
  -#include "atime.h"
  -#include "misc.h"
  +#include "apr_arch_atime.h"
  +#include "apr_arch_misc.h"
   
   /*
    * read_with_timeout() 
  
  
  
  1.26      +1 -1      apr/file_io/win32/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apr/file_io/win32/seek.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- seek.c	1 Jan 2003 00:01:44 -0000	1.25
  +++ seek.c	6 Jan 2003 23:44:22 -0000	1.26
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/fileio.h"
  +#include "win32/apr_arch_fileio.h"
   #include "apr_file_io.h"
   #include <errno.h>
   #include <string.h>
  
  
  
  1.1                  apr/include/arch/aix/apr_arch_dso.h
  
  Index: apr_arch_dso.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_dso.h"
  #include "apr.h"
  
  #if APR_HAS_DSO
  
  void *dlopen(const char *path, int mode);
  void *dlsym(void *handle, const char *symbol);
  const char *dlerror(void);
  int dlclose(void *handle);
  
  struct apr_dso_handle_t {
      apr_pool_t  *pool;
      void          *handle;
      const char *errormsg;
  };
  
  #endif
  
  #endif
  
  
  
  1.1                  apr/include/arch/beos/apr_arch_dso.h
  
  Index: apr_arch_dso.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_errno.h"
  #include "apr_dso.h"
  #include "apr.h"
  #include <kernel/image.h>
  #include <string.h>
  
  #if APR_HAS_DSO
  
  struct apr_dso_handle_t {
      image_id      handle;    /* Handle to the DSO loaded */
      apr_pool_t   *pool;
  };
  
  #endif
  
  #endif
  
  
  
  1.1                  apr/include/arch/beos/apr_arch_proc_mutex.h
  
  Index: apr_arch_proc_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef PROC_MUTEX_H
  #define PROC_MUTEX_H
  
  #include "apr_pools.h"
  #include "apr_proc_mutex.h"
  #include "apr_file_io.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_portable.h"
  
  struct apr_proc_mutex_t {
      apr_pool_t *pool;
      
      /* Our lock :) */
      sem_id Lock;
      int32  LockCount;
  };
  
  #endif  /* PROC_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/beos/apr_arch_thread_cond.h
  
  Index: apr_arch_thread_cond.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_COND_H
  #define THREAD_COND_H
  
  #include <kernel/OS.h>
  #include "apr_pools.h"
  #include "apr_thread_cond.h"
  #include "apr_file_io.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_portable.h"
  #include "apr_ring.h"
  
  struct waiter_t {
      APR_RING_ENTRY(waiter_t) link;
      sem_id sem;
  };
  
  struct apr_thread_cond_t {
      apr_pool_t *pool;
      sem_id lock;
      apr_thread_mutex_t *condlock;
      thread_id owner;
      /* active list */
      APR_RING_HEAD(active_list, waiter_t) alist;
      /* free list */
      APR_RING_HEAD(free_list,   waiter_t) flist;
  };
  
  #endif  /* THREAD_COND_H */
  
  
  
  
  1.1                  apr/include/arch/beos/apr_arch_thread_mutex.h
  
  Index: apr_arch_thread_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_MUTEX_H
  #define THREAD_MUTEX_H
  
  #include <kernel/OS.h>
  #include "apr_pools.h"
  #include "apr_thread_mutex.h"
  #include "apr_file_io.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_portable.h"
  
  struct apr_thread_mutex_t {
      apr_pool_t *pool;
      
      /* Our lock :) */
      sem_id Lock;
      int32  LockCount;
  
      /* If we nest locks we need these... */
      int nested;  
      apr_os_thread_t owner;
      int owner_ref;
  };
  
  #endif  /* THREAD_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/beos/apr_arch_thread_rwlock.h
  
  Index: apr_arch_thread_rwlock.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_RWLOCK_H
  #define THREAD_RWLOCK_H
  
  #include <kernel/OS.h>
  #include "apr_pools.h"
  #include "apr_thread_rwlock.h"
  #include "apr_file_io.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_portable.h"
  
  struct apr_thread_rwlock_t {
      apr_pool_t *pool;
  
      /* Our lock :) */
      sem_id Lock;
      int32  LockCount;
      /* Read/Write lock stuff */
      sem_id Read;
      int32  ReadCount;
      sem_id Write;
      int32  WriteCount;
      int32  Nested;
  
      thread_id writer;
  };
  
  #endif  /* THREAD_RWLOCK_H */
  
  
  
  
  1.1                  apr/include/arch/beos/apr_arch_threadproc.h
  
  Index: apr_arch_threadproc.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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 "fileio.h"
  #include "apr_file_io.h"
  #include "apr_thread_proc.h"
  #include "apr_general.h"
  #include "apr_portable.h"
  #include <kernel/OS.h>
  #include <signal.h>
  #include <string.h>
  #include <sys/wait.h>
  #include <image.h>
  
  #ifndef THREAD_PROC_H
  #define THREAD_PROC_H
  
  #define SHELL_PATH "/bin/sh"
  
  #define PTHREAD_CANCEL_AYNCHRONOUS  CANCEL_ASYNCH; 
  #define PTHREAD_CANCEL_DEFERRED     CANCEL_DEFER; 
                                     
  #define PTHREAD_CANCEL_ENABLE       CANCEL_ENABLE; 
  #define PTHREAD_CANCEL_DISABLE      CANCEL_DISABLE; 
  
  #define BEOS_MAX_DATAKEYS	128
  
  struct apr_thread_t {
      apr_pool_t *pool;
      thread_id td;
      void *data;
      apr_thread_start_t func;
      apr_status_t exitval;
  };
  
  struct apr_threadattr_t {
      apr_pool_t *pool;
      int32 attr;
      int detached;
      int joinable;
  };
  
  struct apr_threadkey_t {
      apr_pool_t *pool;
  	int32  key;
  };
  
  struct beos_private_data {
  	const void ** data;
  	int count;
  	volatile thread_id  td;
  };
  
  struct beos_key {
  	int  assigned;
  	int  count;
  	sem_id  lock;
  	int32  ben_lock;
  	void (* destructor) (void *);
  };
  
  struct apr_procattr_t {
      apr_pool_t *pool;
      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;
  };
  
  struct apr_thread_once_t {
      sem_id sem;
      int hit;
  };
  
  #endif  /* ! THREAD_PROC_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_dso.h
  
  Index: apr_arch_dso.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_dso.h"
  #include "apr.h"
  
  #include <dlfcn.h>
  
  typedef struct sym_list sym_list;
  
  struct sym_list {
      sym_list *next;
      char *symbol;
  };
  
  struct apr_dso_handle_t {
      apr_pool_t  *pool;
      void        *handle;
      const char  *errormsg;
      sym_list    *symbols;
      char        *path;
  };
  
  #endif
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_fileio.h
  
  Index: apr_arch_fileio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef FILE_IO_H
  #define FILE_IO_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_tables.h"
  #include "apr_file_io.h"
  #include "apr_file_info.h"
  #include "apr_errno.h"
  #include "apr_lib.h"
  
  /* System headers the file I/O library needs */
  #if APR_HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
  #if APR_HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #if APR_HAVE_ERRNO_H
  #include <errno.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #if APR_HAVE_STRINGS_H
  #include <strings.h>
  #endif
  #if APR_HAVE_DIRENT_H
  #include <dirent.h>
  #endif
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
  #endif
  #if APR_HAVE_UNISTD_H
  #include <unistd.h>
  #endif
  #if APR_HAVE_STDIO_H
  #include <stdio.h>
  #endif
  #if APR_HAVE_STDLIB_H
  #include <stdlib.h>
  #endif
  #if APR_HAVE_SYS_UIO_H
  #include <sys/uio.h>
  #endif
  #if APR_HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
  
  #include <fsio.h>
  
  /* End System headers */
  
  #define APR_FILE_BUFSIZE 4096
  
  struct apr_file_t {
      apr_pool_t *pool;
      int filedes;
      char *fname;
      apr_int32_t flags;
      int eof_hit;
      int is_pipe;
      apr_interval_time_t timeout;
      int buffered;
      enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
      int ungetchar;    /* Last char provided by an unget op. (-1 = no char)*/
  
      /* Stuff for buffered mode */
      char *buffer;
      int bufpos;               /* Read/Write position in buffer */
      unsigned long dataRead;   /* amount of valid data read into buffer */
      int direction;            /* buffer being used for 0 = read, 1 = write */
      unsigned long filePtr;    /* position in file of handle */
  #if APR_HAS_THREADS
      struct apr_thread_mutex_t *thlock;
  #endif
  };
  
  struct apr_dir_t {
      apr_pool_t *pool;
      char *dirname;
      DIR *dirstruct;
      struct dirent *entry;
  };
  
  typedef struct apr_stat_entry_t apr_stat_entry_t;
  
  struct apr_stat_entry_t {
      struct stat info;
      char *casedName;
      apr_time_t expire;
      NXPathCtx_t pathCtx;
  };
  
  extern apr_int32_t CpuCurrentProcessor; /* system variable */
  
  #define MAX_SERVER_NAME     64
  #define MAX_VOLUME_NAME     64
  #define MAX_PATH_NAME       256
  #define MAX_FILE_NAME       256
  
  #define DRIVE_ONLY          1
  
  /* If the user passes d: vs. D: (or //mach/share vs. //MACH/SHARE),
   * we need to fold the case to canonical form.  This function is
   * supposed to do so.
   */
  apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
  
  /* This function check to see of the given path includes a drive/volume
   * specifier.  If the _only_ parameter is set to DRIVE_ONLY then it 
   * check to see of the path only contains a drive/volume specifier and
   * nothing else.
   */
  apr_status_t filepath_has_drive(const char *rootpath, int only, apr_pool_t *p);
  
  /* This function compares the drive/volume specifiers for each given path.
   * It returns zero if they match or non-zero if not. 
   */
  apr_status_t filepath_compare_drive(const char *path1, const char *path2, apr_pool_t *p);
  
  apr_status_t apr_unix_file_cleanup(void *);
  
  #endif  /* ! FILE_IO_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_global_mutex.h
  
  Index: apr_arch_global_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef GLOBAL_MUTEX_H
  #define GLOBAL_MUTEX_H
  
  #include "apr_global_mutex.h"
  #include "apr_thread_mutex.h"
  
  struct apr_global_mutex_t {
      apr_pool_t *pool;
      apr_thread_mutex_t *mutex;
  };
  
  #endif  /* GLOBAL_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_internal_time.h
  
  Index: apr_arch_internal_time.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001-2003 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/>.
   */
  
  #ifndef TIME_INTERNAL_H
  #define TIME_INTERNAL_H
  
  #include "apr.h"
  
  #define TZONE           (*___timezone())
  
  void apr_netware_setup_time(void);
  
  #endif  /* TIME_INTERNAL_H */
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_networkio.h
  
  Index: apr_arch_networkio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef NETWORK_IO_H
  
  /* Making sure that we include the correct networkio.h since the
      the project file is configured to first look for headers in
      arch/netware and then arch/unix. But in this specific case we 
      want arch/win32.
  */
  #include <../win32/networkio.h>
  
  #endif  /* ! NETWORK_IO_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_pre_nw.h
  
  Index: apr_arch_pre_nw.h
  ===================================================================
  #ifndef __pre_nw__
  #define __pre_nw__
  
  #pragma precompile_target "precomp.mch"
  #define NETWARE
  
  
  #define N_PLAT_NLM
  
  /* hint for MSL C++ that we're on NetWare platform */
  #define __NETWARE__
  
  /* the FAR keyword has no meaning in a 32-bit environment 
     but is used in the SDK headers so we take it out */
  #define FAR
  #define far
  
  /* no-op for Codewarrior C compiler; a functions are cdecl 
     by default */
  #define cdecl
  
  /* if we have wchar_t enabled in C++, predefine this type to avoid
     a conflict in Novell's header files */
  #ifndef DOXYGEN
  #if (__option(cplusplus) && __option(wchar_type))
  #define _WCHAR_T
  #endif
  #endif
  
  /* C9X defintion used by MSL C++ library */
  #define DECIMAL_DIG 17
  
  /* define long long typedefs for Watcom compatiblity */
  typedef long long int64_t;
  typedef unsigned long long uint64_t;
  
  /* some code may want to use the MS convention for long long */
  #ifndef __int64
  #define __int64 long long
  #endif
  
  /* expat version */
  #define VERSION "expat_1.95.1"
  #define EXPAT_MAJOR_VERSION     1
  #define EXPAT_MINOR_VERSION     95
  #define EXPAT_EDIT              2
  
  #define XML_MAJOR_VERSION       EXPAT_MAJOR_VERSION
  #define XML_MINOR_VERSION       EXPAT_MINOR_VERSION
  #define XML_MICRO_VERSION       EXPAT_EDIT
  
  #endif
  
  
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_proc_mutex.h
  
  Index: apr_arch_proc_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef PROC_MUTEX_H
  #define PROC_MUTEX_H
  
  #include "apr_proc_mutex.h"
  #include "apr_thread_mutex.h"
  
  struct apr_proc_mutex_t {
      apr_pool_t *pool;
      apr_thread_mutex_t *mutex;
  };
  
  #endif  /* PROC_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_thread_cond.h
  
  Index: apr_arch_thread_cond.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_COND_H
  #define THREAD_COND_H
  
  #include "apr_thread_cond.h"
  #include <nks/synch.h>
  
  struct apr_thread_cond_t {
      apr_pool_t *pool;
      NXCond_t *cond;
  };
  
  #endif  /* THREAD_COND_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_thread_mutex.h
  
  Index: apr_arch_thread_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_MUTEX_H
  #define THREAD_MUTEX_H
  
  #include "apr_thread_mutex.h"
  #include <nks/synch.h>
  
  struct apr_thread_mutex_t {
      apr_pool_t *pool;
      NXMutex_t *mutex;
  };
  
  #endif  /* THREAD_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_thread_rwlock.h
  
  Index: apr_arch_thread_rwlock.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_RWLOCK_H
  #define THREAD_RWLOCK_H
  
  #include "apr_thread_rwlock.h"
  #include <nks/synch.h>
  
  struct apr_thread_rwlock_t {
      apr_pool_t *pool;
      NXRwLock_t *rwlock;
  };
  
  #endif  /* THREAD_RWLOCK_H */
  
  
  
  
  1.1                  apr/include/arch/netware/apr_arch_threadproc.h
  
  Index: apr_arch_threadproc.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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.h"
  #include "apr_thread_proc.h"
  #include "apr_file_io.h"
  //srj #include "apr_portable.h"
  
  #ifndef THREAD_PROC_H
  #define THREAD_PROC_H
  
  #define SHELL_PATH "cmd.exe"
  #define APR_DEFAULT_STACK_SIZE 65536
  
  struct apr_thread_t {
      apr_pool_t *pool;
      NXContext_t ctx;
      NXThreadId_t td;
      char *thread_name;
      apr_int32_t cancel;
      apr_int32_t cancel_how;
      void *data;
      apr_thread_start_t func;
      apr_status_t exitval;
  };
  
  struct apr_threadattr_t {
      apr_pool_t *pool;
      apr_size_t  stack_size;
      apr_int32_t detach;
      char *thread_name;
  };
  
  struct apr_threadkey_t {
      apr_pool_t *pool;
      NXKey_t key;
  };
  
  struct apr_procattr_t {
      apr_pool_t *pool;
      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;
  };
  
  struct apr_thread_once_t {
      unsigned long value;
  };
  
  //struct apr_proc_t {
  //    apr_pool_t *pool;
  //    pid_t pid;
  //    apr_procattr_t *attr;
  //};
  
  #endif  /* ! THREAD_PROC_H */
  
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_dso.h
  
  Index: apr_arch_dso.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_dso.h"
  #include "apr.h"
  
  #if APR_HAS_DSO
  
  struct apr_dso_handle_t {
      apr_pool_t  *cont;       /* Context for returning error strings */
      HMODULE       handle;     /* Handle to the DSO loaded            */
      apr_status_t   load_error;
      char          *failed_module;
  };
  
  #endif
  
  #endif
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_fileio.h
  
  Index: apr_arch_fileio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef FILE_IO_H
  #define FILE_IO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_thread_mutex.h"
  #include "apr_file_io.h"
  #include "apr_file_info.h"
  #include "apr_errno.h"
  
  /* We have an implementation of mkstemp but it's not very multi-threading 
   * friendly & is part of the POSIX emulation rather than native so don't
   * use it.
   */
  #undef HAVE_MKSTEMP
  
  #define APR_FILE_BUFSIZE 4096
  
  struct apr_file_t {
      apr_pool_t *pool;
      HFILE filedes;
      char * fname;
      int isopen;
      int buffered;
      int eof_hit;
      apr_int32_t flags;
      int timeout;
      int pipe;
      HEV pipeSem;
      enum { BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
  
      /* Stuff for buffered mode */
      char *buffer;
      int bufpos;               // Read/Write position in buffer
      unsigned long dataRead;   // amount of valid data read into buffer
      int direction;            // buffer being used for 0 = read, 1 = write
      unsigned long filePtr;    // position in file of handle
      apr_thread_mutex_t *mutex;// mutex semaphore, must be owned to access the above fields
  };
  
  struct apr_dir_t {
      apr_pool_t *pool;
      char *dirname;
      ULONG handle;
      FILEFINDBUF3 entry;
      int validentry;
  };
  
  apr_status_t apr_file_cleanup(void *);
  apr_status_t apr_os2_time_to_apr_time(apr_time_t *result, FDATE os2date, 
                                        FTIME os2time);
  
  /* see win32/fileio.h for description of these */
  extern const char c_is_fnchar[256];
  
  #define IS_FNCHAR(c) c_is_fnchar[(unsigned char)c]
  
  apr_status_t filepath_root_test(char *path, apr_pool_t *p);
  apr_status_t filepath_drive_get(char **rootpath, char drive, 
                                  apr_int32_t flags, apr_pool_t *p);
  apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
  
  #endif  /* ! FILE_IO_H */
  
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_networkio.h
  
  Index: apr_arch_networkio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef NETWORK_IO_H
  #define NETWORK_IO_H
  
  #include "apr_private.h"
  #include "apr_network_io.h"
  #include "apr_general.h"
  #include "os2calls.h"
  #if APR_HAVE_NETDB_H
  #include <netdb.h>
  #endif
  
  struct apr_socket_t {
      apr_pool_t *cntxt;
      int socketdes;
      int type;
      int protocol;
      apr_sockaddr_t *local_addr;
      apr_sockaddr_t *remote_addr;
      apr_interval_time_t timeout;
      int nonblock;
      int local_port_unknown;
      int local_interface_unknown;
      int remote_addr_unknown;
      apr_int32_t netmask;
      apr_int32_t inherit;
  };
  
  /* Error codes returned from sock_errno() */
  #define SOCBASEERR              10000
  #define SOCEPERM                (SOCBASEERR+1)             /* Not owner */
  #define SOCESRCH                (SOCBASEERR+3)             /* No such process */
  #define SOCEINTR                (SOCBASEERR+4)             /* Interrupted system call */
  #define SOCENXIO                (SOCBASEERR+6)             /* No such device or address */
  #define SOCEBADF                (SOCBASEERR+9)             /* Bad file number */
  #define SOCEACCES               (SOCBASEERR+13)            /* Permission denied */
  #define SOCEFAULT               (SOCBASEERR+14)            /* Bad address */
  #define SOCEINVAL               (SOCBASEERR+22)            /* Invalid argument */
  #define SOCEMFILE               (SOCBASEERR+24)            /* Too many open files */
  #define SOCEPIPE                (SOCBASEERR+32)            /* Broken pipe */
  #define SOCEOS2ERR              (SOCBASEERR+100)            /* OS/2 Error */
  
  const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size);
  int apr_inet_pton(int af, const char *src, void *dst);
  void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
  
  #endif  /* ! NETWORK_IO_H */
  
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_os2calls.h
  
  Index: apr_arch_os2calls.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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_errno.h"
  #include <sys/types.h>
  #include <sys/socket.h>
  
  extern int (*apr_os2_socket)(int, int, int);
  extern int (*apr_os2_select)(int *, int, int, int, long);
  extern int (*apr_os2_sock_errno)();
  extern int (*apr_os2_accept)(int, struct sockaddr *, int *);
  extern int (*apr_os2_bind)(int, struct sockaddr *, int);
  extern int (*apr_os2_connect)(int, struct sockaddr *, int);
  extern int (*apr_os2_getpeername)(int, struct sockaddr *, int *);
  extern int (*apr_os2_getsockname)(int, struct sockaddr *, int *);
  extern int (*apr_os2_getsockopt)(int, int, int, char *, int *);
  extern int (*apr_os2_ioctl)(int, int, caddr_t, int);
  extern int (*apr_os2_listen)(int, int);
  extern int (*apr_os2_recv)(int, char *, int, int);
  extern int (*apr_os2_send)(int, const char *, int, int);
  extern int (*apr_os2_setsockopt)(int, int, int, char *, int);
  extern int (*apr_os2_shutdown)(int, int);
  extern int (*apr_os2_soclose)(int);
  extern int (*apr_os2_writev)(int, struct iovec *, int);
  extern int (*apr_os2_sendto)(int, const char *, int, int, const struct sockaddr *, int);
  extern int (*apr_os2_recvfrom)(int, char *, int, int, struct sockaddr *, int *);
  
  #define socket apr_os2_socket
  #define select apr_os2_select
  #define sock_errno apr_os2_sock_errno
  #define accept apr_os2_accept
  #define bind apr_os2_bind
  #define connect apr_os2_connect
  #define getpeername apr_os2_getpeername
  #define getsockname apr_os2_getsockname
  #define getsockopt apr_os2_getsockopt
  #define ioctl apr_os2_ioctl
  #define listen apr_os2_listen
  #define recv apr_os2_recv
  #define send apr_os2_send
  #define setsockopt apr_os2_setsockopt
  #define shutdown apr_os2_shutdown
  #define soclose apr_os2_soclose
  #define writev apr_os2_writev
  #define sendto apr_os2_sendto
  #define recvfrom apr_os2_recvfrom
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_proc_mutex.h
  
  Index: apr_arch_proc_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef PROC_MUTEX_H
  #define PROC_MUTEX_H
  
  #include "apr_proc_mutex.h"
  #include "apr_file_io.h"
  
  struct apr_proc_mutex_t {
      apr_pool_t *pool;
      HMTX hMutex;
      TID owner;
      int lock_count;
  };
  
  #endif  /* PROC_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_thread_cond.h
  
  Index: apr_arch_thread_cond.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_COND_H
  #define THREAD_COND_H
  
  #include "apr_thread_cond.h"
  #include "apr_file_io.h"
  
  struct apr_thread_cond_t {
      apr_pool_t *pool;
  };
  
  #endif  /* THREAD_COND_H */
  
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_thread_mutex.h
  
  Index: apr_arch_thread_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_MUTEX_H
  #define THREAD_MUTEX_H
  
  #include "apr_thread_mutex.h"
  #include "apr_file_io.h"
  
  struct apr_thread_mutex_t {
      apr_pool_t *pool;
      HMTX hMutex;
  };
  
  #endif  /* THREAD_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_thread_rwlock.h
  
  Index: apr_arch_thread_rwlock.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_RWLOCK_H
  #define THREAD_RWLOCK_H
  
  #include "apr_thread_rwlock.h"
  #include "apr_file_io.h"
  
  struct apr_thread_rwlock_t {
      apr_pool_t *pool;
      int readers;
      HMTX write_lock;
      HEV read_done;
  };
  
  #endif  /* THREAD_RWLOCK_H */
  
  
  
  
  1.1                  apr/include/arch/os2/apr_arch_threadproc.h
  
  Index: apr_arch_threadproc.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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 *pool;
      unsigned long attr;
  };
  
  struct apr_thread_t {
      apr_pool_t *pool;
      struct apr_threadattr_t *attr;
      unsigned long tid;
      apr_thread_start_t func;
      void *data;
      apr_status_t exitval;
  };
  
  struct apr_threadkey_t {
      apr_pool_t *pool;
      unsigned long *key;
  };
  
  struct apr_procattr_t {
      apr_pool_t *pool;
      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;
  };
  
  struct apr_thread_once_t {
      unsigned long sem;
      char hit;
  };
  
  #endif  /* ! THREAD_PROC_H */
  
  
  
  
  1.1                  apr/include/arch/os390/apr_arch_dso.h
  
  Index: apr_arch_dso.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_dso.h"
  #include "apr.h"
  
  #if APR_HAS_DSO
  
  #include <dll.h>
  
  struct apr_dso_handle_t {
      dllhandle  *handle;     /* Handle to the DSO loaded            */
      int failing_errno;      /* Don't save the buffer returned by
                                 strerror(); it gets reused          */
      apr_pool_t *pool;
  };
  
  #endif
  
  #endif
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_dso.h
  
  Index: apr_arch_dso.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_dso.h"
  #include "apr.h"
  
  #if APR_HAS_DSO
  
  #ifdef HAVE_MACH_O_DYLD_H
  #include <mach-o/dyld.h>
  #endif
  
  #ifdef HAVE_DLFCN_H
  #include <dlfcn.h>
  #endif
  
  #ifdef HAVE_DL_H
  #include <dl.h>
  #endif
  
  #ifndef RTLD_NOW
  #define RTLD_NOW 1
  #endif
  
  #ifndef RTLD_GLOBAL
  #define RTLD_GLOBAL 0
  #endif
  
  #if (defined(__FreeBSD__) ||\
       defined(__OpenBSD__) ||\
       defined(__NetBSD__)     ) && !defined(__ELF__)
  #define DLSYM_NEEDS_UNDERSCORE
  #endif
  
  struct apr_dso_handle_t {
      apr_pool_t    *pool;
      void          *handle;
      const char    *errormsg;
  };
  
  #endif
  
  #endif
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_fileio.h
  
  Index: apr_arch_fileio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef FILE_IO_H
  #define FILE_IO_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_tables.h"
  #include "apr_file_io.h"
  #include "apr_file_info.h"
  #include "apr_errno.h"
  #include "apr_lib.h"
  #include "apr_thread_mutex.h"
  
  /* System headers the file I/O library needs */
  #if APR_HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
  #if APR_HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #if APR_HAVE_ERRNO_H
  #include <errno.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #if APR_HAVE_STRINGS_H
  #include <strings.h>
  #endif
  #if APR_HAVE_DIRENT_H
  #include <dirent.h>
  #endif
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
  #endif
  #if APR_HAVE_UNISTD_H
  #include <unistd.h>
  #endif
  #if APR_HAVE_STDIO_H
  #include <stdio.h>
  #endif
  #if APR_HAVE_STDLIB_H
  #include <stdlib.h>
  #endif
  #if APR_HAVE_SYS_UIO_H
  #include <sys/uio.h>
  #endif
  #if APR_HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
  #ifdef BEOS
  #include <kernel/OS.h>
  #endif
  
  #if BEOS_BONE
  # ifndef BONE7
    /* prior to BONE/7 fd_set & select were defined in sys/socket.h */
  #  include <sys/socket.h>
  # else
    /* Be moved the fd_set stuff and also the FIONBIO definition... */
  #  include <sys/ioctl.h>
  # endif
  #endif
  /* End System headers */
  
  #define APR_FILE_BUFSIZE 4096
  
  struct apr_file_t {
      apr_pool_t *pool;
      int filedes;
      char *fname;
      apr_int32_t flags;
      int eof_hit;
      int is_pipe;
      apr_interval_time_t timeout;
      int buffered;
      enum {BLK_UNKNOWN, BLK_OFF, BLK_ON } blocking;
      int ungetchar;    /* Last char provided by an unget op. (-1 = no char)*/
  
      /* Stuff for buffered mode */
      char *buffer;
      int bufpos;               /* Read/Write position in buffer */
      unsigned long dataRead;   /* amount of valid data read into buffer */
      int direction;            /* buffer being used for 0 = read, 1 = write */
      unsigned long filePtr;    /* position in file of handle */
  #if APR_HAS_THREADS
      struct apr_thread_mutex_t *thlock;
  #endif
  };
  
  struct apr_dir_t {
      apr_pool_t *pool;
      char *dirname;
      DIR *dirstruct;
      struct dirent *entry;
  };
  
  apr_status_t apr_unix_file_cleanup(void *);
  
  mode_t apr_unix_perms2mode(apr_fileperms_t perms);
  apr_fileperms_t apr_unix_mode2perms(mode_t mode);
  
  #endif  /* ! FILE_IO_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_global_mutex.h
  
  Index: apr_arch_global_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef GLOBAL_MUTEX_H
  #define GLOBAL_MUTEX_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_global_mutex.h"
  #include "proc_mutex.h"
  #include "thread_mutex.h"
  
  struct apr_global_mutex_t {
      apr_pool_t *pool;
      apr_proc_mutex_t *proc_mutex;
  #if APR_HAS_THREADS
      apr_thread_mutex_t *thread_mutex;
  #endif /* APR_HAS_THREADS */
  };
  
  #endif  /* GLOBAL_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_inherit.h
  
  Index: apr_arch_inherit.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef INHERIT_H
  #define INHERIT_H
  
  #include "apr_inherit.h"
  
  #define APR_INHERIT (1 << 24)    /* Must not conflict with other bits */
  
  #define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
  apr_status_t apr_##name##_inherit_set(apr_##name##_t *the##name)    \
  {                                                                   \
      if (!(the##name->flag & APR_INHERIT)) {                         \
          the##name->flag |= APR_INHERIT;                             \
          apr_pool_child_cleanup_set(the##name->pool,                 \
                                     (void *)the##name,               \
                                     cleanup, apr_pool_cleanup_null); \
      }                                                               \
      return APR_SUCCESS;                                             \
  }                                                                   \
  /* Deprecated */                                                    \
  void apr_##name##_set_inherit(apr_##name##_t *the##name)            \
  {                                                                   \
      apr_##name##_inherit_set(the##name);                            \
  }
  
  #define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
  apr_status_t apr_##name##_inherit_unset(apr_##name##_t *the##name)  \
  {                                                                   \
      if (the##name->flag & APR_INHERIT) {                            \
          the##name->flag &= ~APR_INHERIT;                            \
          apr_pool_child_cleanup_set(the##name->pool,                 \
                                     (void *)the##name,               \
                                     cleanup, cleanup);               \
      }                                                               \
      return APR_SUCCESS;                                             \
  }                                                                   \
  /* Deprecated */                                                    \
  void apr_##name##_unset_inherit(apr_##name##_t *the##name)          \
  {                                                                   \
      apr_##name##_inherit_unset(the##name);                          \
  }
  
  #endif	/* ! INHERIT_H */
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_internal_time.h
  
  Index: apr_arch_internal_time.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2001-2003 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/>.
   */
  
  #ifndef TIME_INTERNAL_H
  #define TIME_INTERNAL_H
  
  #include "apr.h"
  
  void apr_unix_setup_time(void);
  
  #endif  /* TIME_INTERNAL_H */
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_misc.h
  
  Index: apr_arch_misc.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef MISC_H
  #define MISC_H
  
  #include "apr.h"
  #include "apr_portable.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_getopt.h"
  #include "apr_thread_proc.h"
  #include "apr_file_io.h"
  #include "apr_errno.h"
  #include "apr_getopt.h"
  
  #if APR_HAVE_STDIO_H
  #include <stdio.h>
  #endif
  #if APR_HAVE_SIGNAL_H
  #include <signal.h>
  #endif
  #if APR_HAVE_PTHREAD_H
  #include <pthread.h>
  #endif
  
  #if APR_HAVE_STDLIB_H
  #include <stdlib.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  
  #ifdef BEOS
  #include <kernel/OS.h>
  #endif
  
  struct apr_other_child_rec_t {
      apr_pool_t *p;
      struct apr_other_child_rec_t *next;
      apr_proc_t *proc;
      void (*maintenance) (int, void *, int);
      void *data;
      apr_os_file_t write_fd;
  };
  
  #if defined(WIN32) || defined(NETWARE)
  #define WSAHighByte 2
  #define WSALowByte 0
  #endif
  
  #endif  /* ! MISC_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_networkio.h
  
  Index: apr_arch_networkio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef NETWORK_IO_H
  #define NETWORK_IO_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_network_io.h"
  #include "apr_errno.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  
  /* System headers the network I/O library needs */
  #if APR_HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #if APR_HAVE_SYS_UIO_H
  #include <sys/uio.h>
  #endif
  #ifdef HAVE_SYS_SELECT_H
  #include <sys/select.h>
  #endif
  #if APR_HAVE_ERRNO_H
  #include <errno.h>
  #endif
  #if APR_HAVE_SYS_TIME_H
  #include <sys/time.h>
  #endif
  #if APR_HAVE_UNISTD_H
  #include <unistd.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #if APR_HAVE_NETINET_TCP_H
  #include <netinet/tcp.h>
  #endif
  #if APR_HAVE_NETINET_SCTP_UIO_H
  #include <netinet/sctp_uio.h>
  #endif
  #if APR_HAVE_NETINET_SCTP_H
  #include <netinet/sctp.h>
  #endif
  #if APR_HAVE_NETINET_IN_H
  #include <netinet/in.h>
  #endif
  #if APR_HAVE_ARPA_INET_H
  #include <arpa/inet.h>
  #endif
  #if APR_HAVE_SYS_SOCKET_H
  #include <sys/socket.h>
  #endif
  #if APR_HAVE_NETDB_H
  #include <netdb.h>
  #endif
  #if APR_HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
  #if APR_HAVE_SYS_SENDFILE_H
  #include <sys/sendfile.h>
  #endif
  /* End System Headers */
  
  #ifndef HAVE_POLLIN
  #define POLLIN   1
  #define POLLPRI  2
  #define POLLOUT  4
  #define POLLERR  8
  #define POLLHUP  16
  #define POLLNVAL 32
  #endif
  
  struct apr_socket_t {
      apr_pool_t *cntxt;
      int socketdes;
      int type;
      int protocol;
      apr_sockaddr_t *local_addr;
      apr_sockaddr_t *remote_addr;
      apr_interval_time_t timeout; 
  #ifndef HAVE_POLL
      int connected;
  #endif
      int local_port_unknown;
      int local_interface_unknown;
      int remote_addr_unknown;
      apr_int32_t netmask;
      apr_int32_t inherit;
  };
  
  const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size);
  int apr_inet_pton(int af, const char *src, void *dst);
  void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
  
  #define apr_is_option_set(mask, option)  ((mask & option) ==option)
  
  #define apr_set_option(mask, option, on) \
      do {                                 \
          if (on)                          \
              *mask |= option;             \
          else                             \
              *mask &= ~option;            \
      } while (0)
  
  #endif  /* ! NETWORK_IO_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_proc_mutex.h
  
  Index: apr_arch_proc_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef PROC_MUTEX_H
  #define PROC_MUTEX_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_proc_mutex.h"
  #include "apr_pools.h"
  #include "apr_portable.h"
  #include "apr_file_io.h"
  #include "fileio.h"
  
  /* System headers required by Locks library */
  #if APR_HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #if APR_HAVE_STDIO_H
  #include <stdio.h>
  #endif
  #if APR_HAVE_FCNTL_H
  #include <fcntl.h>
  #endif
  
  #ifdef HAVE_SYS_IPC_H
  #include <sys/ipc.h>
  #endif
  #ifdef HAVE_SYS_SEM_H
  #include <sys/sem.h>
  #endif
  #ifdef HAVE_SYS_FILE_H
  #include <sys/file.h>
  #endif
  #if APR_HAVE_STDLIB_H
  #include <stdlib.h>
  #endif
  #if APR_HAVE_UNISTD_H
  #include <unistd.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #ifdef HAVE_SYS_MMAN_H
  #include <sys/mman.h>
  #endif
  #if APR_HAVE_PTHREAD_H
  #include <pthread.h>
  #endif
  #if APR_HAVE_SEMAPHORE_H
  #include <semaphore.h>
  #endif
  /* End System Headers */
  
  struct apr_proc_mutex_unix_lock_methods_t {
      unsigned int flags;
      apr_status_t (*create)(apr_proc_mutex_t *, const char *);
      apr_status_t (*acquire)(apr_proc_mutex_t *);
      apr_status_t (*tryacquire)(apr_proc_mutex_t *);
      apr_status_t (*release)(apr_proc_mutex_t *);
      apr_status_t (*cleanup)(void *);
      apr_status_t (*child_init)(apr_proc_mutex_t **, apr_pool_t *, const char *);
      const char *name;
  };
  typedef struct apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_lock_methods_t;
  
  /* bit values for flags field in apr_unix_lock_methods_t */
  #define APR_PROCESS_LOCK_MECH_IS_GLOBAL          1
  
  #if APR_HAS_POSIXSEM_SERIALIZE
  extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_posix_methods;
  #endif
  #if APR_HAS_SYSVSEM_SERIALIZE
  extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_sysv_methods;
  #endif
  #if APR_HAS_FCNTL_SERIALIZE
  extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_fcntl_methods;
  #endif
  #if APR_HAS_FLOCK_SERIALIZE
  extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_flock_methods;
  #endif
  #if APR_HAS_PROC_PTHREAD_SERIALIZE
  extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_proc_pthread_methods;
  #endif
  #if APR_HAS_RWLOCK_SERIALIZE
  extern const apr_proc_mutex_unix_lock_methods_t apr_proc_mutex_unix_rwlock_methods;
  #endif
  
  
  #if !APR_HAVE_UNION_SEMUN && defined(APR_HAS_SYSVSEM_SERIALIZE)
  union semun {
      int val;
      struct semid_ds *buf;
      unsigned short *array;
  };
  #endif
  
  struct apr_proc_mutex_t {
      apr_pool_t *pool;
      const apr_proc_mutex_unix_lock_methods_t *meth;
      const apr_proc_mutex_unix_lock_methods_t *inter_meth;
      int curr_locked;
      char *fname;
  #if APR_HAS_SYSVSEM_SERIALIZE || APR_HAS_FCNTL_SERIALIZE || APR_HAS_FLOCK_SERIALIZE
      apr_file_t *interproc;
  #endif
  #if APR_HAS_PROC_PTHREAD_SERIALIZE
      pthread_mutex_t *pthread_interproc;
  #endif
  };
  
  void apr_proc_mutex_unix_setup_lock(void);
  
  #endif  /* PROC_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_shm.h
  
  Index: apr_arch_shm.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef SHM_H
  #define SHM_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_shm.h"
  #include "apr_pools.h"
  #include "apr_file_io.h"
  #include "apr_network_io.h"
  #include "apr_portable.h"
  
  #ifdef HAVE_SYS_MMAN_H
  #include <sys/mman.h>
  #endif
  #ifdef HAVE_SYS_IPC_H
  #include <sys/ipc.h>
  #endif
  #ifdef HAVE_SYS_SHM_H
  #include <sys/shm.h>
  #endif
  #if !defined(SHM_R)
  #define SHM_R 0400
  #endif
  #if !defined(SHM_W)
  #define SHM_W 0200
  #endif
  #ifdef HAVE_SYS_FILE_H
  #include <sys/file.h>
  #endif
  
  /* Not all systems seem to have MAP_FAILED defined, but it should always
   * just be (void *)-1. */
  #ifndef MAP_FAILED
  #define MAP_FAILED ((void *)-1)
  #endif
  
  struct apr_shm_t {
      apr_pool_t *pool;
      void *base;          /* base real address */
      void *usable;        /* base usable address */
      apr_size_t reqsize;  /* requested segment size */
      apr_size_t realsize; /* actual segment size */
      const char *filename;      /* NULL if anonymous */
  #if APR_USE_SHMEM_SHMGET || APR_USE_SHMEM_SHMGET_ANON
      int shmid;          /* shmem ID returned from shmget() */
  #endif
  };
  
  #endif /* SHM_H */
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_thread_cond.h
  
  Index: apr_arch_thread_cond.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_COND_H
  #define THREAD_COND_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_lib.h"
  #include "apr_thread_mutex.h"
  #include "apr_thread_cond.h"
  #include "apr_pools.h"
  
  #if APR_HAVE_PTHREAD_H
  #include <pthread.h>
  #endif
  
  /* XXX: Should we have a better autoconf search, something like
   * APR_HAS_PTHREAD_COND? -aaron */
  #if APR_HAS_THREADS
  struct apr_thread_cond_t {
      apr_pool_t *pool;
      pthread_cond_t *cond;
  };
  #endif
  
  #endif  /* THREAD_COND_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_thread_mutex.h
  
  Index: apr_arch_thread_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_MUTEX_H
  #define THREAD_MUTEX_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_thread_mutex.h"
  #include "apr_portable.h"
  
  #if APR_HAVE_PTHREAD_H
  #include <pthread.h>
  #endif
  
  #if APR_HAS_THREADS
  struct apr_thread_mutex_t {
      apr_pool_t *pool;
      pthread_mutex_t mutex;
      apr_os_thread_t owner;
      int owner_ref;
      char nested; /* a boolean */
  };
  #endif
  
  #endif  /* THREAD_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_thread_rwlock.h
  
  Index: apr_arch_thread_rwlock.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_RWLOCK_H
  #define THREAD_RWLOCK_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_thread_rwlock.h"
  #include "apr_pools.h"
  
  #if APR_HAVE_PTHREAD_H
  /* this gives us pthread_rwlock_t */
  #include <pthread.h>
  #endif
  
  #if APR_HAS_THREADS
  #if HAVE_PTHREAD_RWLOCK_INIT
  
  struct apr_thread_rwlock_t {
      apr_pool_t *pool;
      pthread_rwlock_t *rwlock;
  };
  
  #else
  
  struct apr_thread_rwlock_t {
      apr_pool_t *pool;
  };
  #endif
  
  #endif
  
  #endif  /* THREAD_RWLOCK_H */
  
  
  
  
  1.1                  apr/include/arch/unix/apr_arch_threadproc.h
  
  Index: apr_arch_threadproc.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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.h"
  #include "apr_private.h"
  #include "apr_thread_proc.h"
  #include "apr_file_io.h"
  #include "fileio.h"
  
  /* System headers required for thread/process library */
  #if APR_HAVE_PTHREAD_H
  #include <pthread.h>
  #endif
  #ifdef HAVE_SYS_RESOURCE_H
  #include <sys/resource.h>
  #endif
  #if APR_HAVE_SIGNAL_H
  #include <signal.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  #if APR_HAVE_SYS_WAIT_H
  #include <sys/wait.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  /* End System Headers */
  
  
  #ifndef THREAD_PROC_H
  #define THREAD_PROC_H
  
  #define SHELL_PATH "/bin/sh"
  
  #if APR_HAS_THREADS
  
  struct apr_thread_t {
      apr_pool_t *pool;
      pthread_t *td;
      void *data;
      apr_thread_start_t func;
      apr_status_t exitval;
  };
  
  struct apr_threadattr_t {
      apr_pool_t *pool;
      pthread_attr_t *attr;
  };
  
  struct apr_threadkey_t {
      apr_pool_t *pool;
      pthread_key_t key;
  };
  
  struct apr_thread_once_t {
      pthread_once_t once;
  };
  
  #endif
  
  struct apr_procattr_t {
      apr_pool_t *pool;
      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;
  #ifdef RLIMIT_CPU
      struct rlimit *limit_cpu;
  #endif
  #if defined (RLIMIT_DATA) || defined (RLIMIT_VMEM) || defined(RLIMIT_AS)
      struct rlimit *limit_mem;
  #endif
  #ifdef RLIMIT_NPROC
      struct rlimit *limit_nproc;
  #endif
  #ifdef RLIMIT_NOFILE
      struct rlimit *limit_nofile;
  #endif
  };
  
  #endif  /* ! THREAD_PROC_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_atime.h
  
  Index: apr_arch_atime.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef ATIME_H
  #define ATIME_H
  
  #include "apr_private.h"
  #include "apr_time.h"
  #if APR_HAVE_TIME_H
  #include <time.h>
  #endif
  
  struct atime_t {
      apr_pool_t *cntxt;
      apr_time_t currtime;
      SYSTEMTIME *explodedtime;
  };
  
  
  /* Number of micro-seconds between the beginning of the Windows epoch
   * (Jan. 1, 1601) and the Unix epoch (Jan. 1, 1970) 
   */
  #define APR_DELTA_EPOCH_IN_USEC   APR_TIME_C(11644473600000000);
  
  
  __inline void FileTimeToAprTime(apr_time_t *result, FILETIME *input)
  {
      /* Convert FILETIME one 64 bit number so we can work with it. */
      *result = input->dwHighDateTime;
      *result = (*result) << 32;
      *result |= input->dwLowDateTime;
      *result /= 10;    /* Convert from 100 nano-sec periods to micro-seconds. */
      *result -= APR_DELTA_EPOCH_IN_USEC;  /* Convert from Windows epoch to Unix epoch */
      return;
  }
  
  
  __inline void AprTimeToFileTime(LPFILETIME pft, apr_time_t t)
  {
      LONGLONG ll;
      t += APR_DELTA_EPOCH_IN_USEC;
      ll = t * 10;
      pft->dwLowDateTime = (DWORD)ll;
      pft->dwHighDateTime = (DWORD) (ll >> 32);
      return;
  }
  
  
  #endif  /* ! ATIME_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_dso.h
  
  Index: apr_arch_dso.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef DSO_H
  #define DSO_H
  
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_dso.h"
  #include "apr.h"
  
  #if APR_HAS_DSO
  
  struct apr_dso_handle_t {
      apr_pool_t  *cont;
      void          *handle;
      apr_status_t   load_error;
  };
  
  #endif
  
  #endif
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_fileio.h
  
  Index: apr_arch_fileio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef FILE_IO_H
  #define FILE_IO_H
  
  #include "apr.h"
  #include "apr_private.h"
  #include "apr_pools.h"
  #include "apr_general.h"
  #include "apr_tables.h"
  #include "apr_thread_mutex.h"
  #include "apr_file_io.h"
  #include "apr_file_info.h"
  #include "apr_errno.h"
  #include "misc.h"
  
  #ifdef HAVE_SYS_STAT_H
  #include <sys/stat.h>
  #endif
  #if APR_HAVE_SYS_TYPES_H
  #include <sys/types.h>
  #endif
  #ifdef HAVE_SYS_FCNTL_H
  #include <fcntl.h>
  #endif
  #ifdef HAVE_TIME_H
  #include <time.h>
  #endif
  #if APR_HAVE_DIRENT_H
  #include <dirent.h>
  #endif
  #ifdef HAVE_MALLOC_H
  #include <malloc.h>
  #endif
  
  #if APR_HAS_UNICODE_FS
  #include "arch/win32/utf8.h"
  #include <wchar.h>
  
  typedef apr_uint16_t apr_wchar_t;
  
  /* Helper functions for the WinNT ApiW() functions.  APR treats all
   * resource identifiers (files, etc) by their UTF-8 name, to provide 
   * access to all named identifiers.  [UTF-8 completely maps Unicode 
   * into char type strings.]
   *
   * The _path flavors below provide us fast mappings of the
   * Unicode filename //?/D:/path and //?/UNC/mach/share/path mappings,
   * which allow unlimited (well, 32000 wide character) length names.
   * These prefixes may appear in Unicode, but must not appear in the
   * Ascii API calls.  So we tack them on in utf8_to_unicode_path, and
   * strip them right back off in unicode_to_utf8_path.
   */
  apr_status_t utf8_to_unicode_path(apr_wchar_t* dststr, apr_size_t dstchars, 
                                    const char* srcstr);
  apr_status_t unicode_to_utf8_path(char* dststr, apr_size_t dstchars, 
                                    const apr_wchar_t* srcstr);
  
  #endif /* APR_HAS_UNICODE_FS */
  
  /* Another Helper functions for the WinNT ApiW() functions.  We need to
   * derive some 'resource' names (max length 255 characters, prefixed with
   * Global/ or Local/ on WinNT) from something that looks like a filename.
   * Since 'resource' names never contain slashes, convert these to '_'s
   * and return the appropriate char* or wchar* for ApiA or ApiW calls.
   */
  
  void *res_name_from_filename(const char *file, int global, apr_pool_t *pool);
  
  #define APR_FILE_MAX MAX_PATH
  
  #define APR_FILE_BUFSIZE 4096
  
  /* obscure ommissions from msvc's sys/stat.h */
  #ifdef _MSC_VER
  #define S_IFIFO        _S_IFIFO /* pipe */
  #define S_IFBLK        0060000  /* Block Special */
  #define S_IFLNK        0120000  /* Symbolic Link */
  #define S_IFSOCK       0140000  /* Socket */
  #define S_IFWHT        0160000  /* Whiteout */
  #endif
  
  /* Internal Flags for apr_file_open */
  #define APR_OPENINFO     0x4000    /* Open without READ or WRITE access */
  #define APR_OPENLINK     0x2000    /* Open a link itself, if supported */
  #define APR_READCONTROL  0x1000    /* Read the file's owner/perms */
  #define APR_WRITECONTROL 0x0800    /* Modifythe file's owner/perms */
  
  /* Entries missing from the MSVC 5.0 Win32 SDK:
   */
  #ifndef FILE_ATTRIBUTE_DEVICE
  #define FILE_ATTRIBUTE_DEVICE        0x00000040
  #endif
  #ifndef FILE_ATTRIBUTE_REPARSE_POINT
  #define FILE_ATTRIBUTE_REPARSE_POINT 0x00000400
  #endif
  #ifndef FILE_FLAG_OPEN_NO_RECALL
  #define FILE_FLAG_OPEN_NO_RECALL     0x00100000
  #endif
  #ifndef FILE_FLAG_OPEN_REPARSE_POINT
  #define FILE_FLAG_OPEN_REPARSE_POINT 0x00200000
  #endif
  #ifndef TRUSTEE_IS_WELL_KNOWN_GROUP
  #define TRUSTEE_IS_WELL_KNOWN_GROUP  5
  #endif
  
  /* Information bits available from the WIN32 FindFirstFile function */
  #define APR_FINFO_WIN32_DIR (APR_FINFO_NAME  | APR_FINFO_TYPE \
                             | APR_FINFO_CTIME | APR_FINFO_ATIME \
                             | APR_FINFO_MTIME | APR_FINFO_SIZE)
  
  /* Sneak the Readonly bit through finfo->protection for internal use _only_ */
  #define APR_FREADONLY 0x10000000 
  
  /* Private function for apr_stat/lstat/getfileinfo/dir_read */
  int fillin_fileinfo(apr_finfo_t *finfo, WIN32_FILE_ATTRIBUTE_DATA *wininfo, 
                      int byhandle, apr_int32_t wanted);
  
  /* Private function that extends apr_stat/lstat/getfileinfo/dir_read */
  apr_status_t more_finfo(apr_finfo_t *finfo, const void *ufile, 
                          apr_int32_t wanted, int whatfile);
  
  /* whatfile types for the ufile arg */
  #define MORE_OF_HANDLE 0
  #define MORE_OF_FSPEC  1
  #define MORE_OF_WFSPEC 2
  
  /* quick run-down of fields in windows' apr_file_t structure that may have 
   * obvious uses.
   * fname --  the filename as passed to the open call.
   * dwFileAttricutes -- Attributes used to open the file.
   * append -- Windows doesn't support the append concept when opening files.
   *           APR needs to keep track of this, and always make sure we append
   *           correctly when writing to a file with this flag set TRUE.
   */
  
  // for apr_poll.c;
  #define filedes filehand
  
  struct apr_file_t {
      apr_pool_t *pool;
      HANDLE filehand;
      BOOLEAN pipe;              // Is this a pipe of a file?
      OVERLAPPED *pOverlapped;
      apr_interval_time_t timeout;
      apr_int32_t flags;
  
      /* File specific info */
      apr_finfo_t *finfo;
      char *fname;
      DWORD dwFileAttributes;
      int eof_hit;
      BOOLEAN buffered;          // Use buffered I/O?
      int ungetchar;             // Last char provided by an unget op. (-1 = no char)
      int append; 
  
      /* Stuff for buffered mode */
      char *buffer;
      apr_size_t bufpos;         // Read/Write position in buffer
      apr_size_t dataRead;       // amount of valid data read into buffer
      int direction;             // buffer being used for 0 = read, 1 = write
      apr_off_t filePtr;         // position in file of handle
      apr_thread_mutex_t *mutex; // mutex semaphore, must be owned to access the above fields
  
      /* Pipe specific info */    
  };
  
  struct apr_dir_t {
      apr_pool_t *pool;
      HANDLE dirhand;
      apr_size_t rootlen;
      char *dirname;
      char *name;
      union {
  #if APR_HAS_UNICODE_FS
          struct {
              WIN32_FIND_DATAW *entry;
          } w;
  #endif
  #if APR_HAS_ANSI_FS
          struct {
              WIN32_FIND_DATAA *entry;
          } n;
  #endif        
      };
      int bof;
  };
  
  /* There are many goofy characters the filesystem can't accept
   * or can confound the cmd.exe shell.  Here's the list
   * [declared in filesys.c]
   */
  extern const char apr_c_is_fnchar[256];
  
  #define IS_FNCHAR(c) (apr_c_is_fnchar[(unsigned char)(c)] & 1)
  #define IS_SHCHAR(c) ((apr_c_is_fnchar[(unsigned char)(c)] & 2) == 2)
  
  
  /* If the user passes APR_FILEPATH_TRUENAME to either
   * apr_filepath_root or apr_filepath_merge, this fn determines
   * that the root really exists.  It's expensive, wouldn't want
   * to do this too frequenly.
   */
  apr_status_t filepath_root_test(char *path, apr_pool_t *p);
  
  
  /* The apr_filepath_merge wants to canonicalize the cwd to the 
   * addpath if the user passes NULL as the old root path (this
   * isn't true of an empty string "", which won't be concatenated.
   *
   * But we need to figure out what the cwd of a given volume is,
   * when the user passes D:foo.  This fn will determine D:'s cwd.
   *
   * If flags includes the bit APR_FILEPATH_NATIVE, the path returned
   * is in the os-native format.
   */
  apr_status_t filepath_drive_get(char **rootpath, char drive, 
                                  apr_int32_t flags, apr_pool_t *p);
  
  
  /* If the user passes d: vs. D: (or //mach/share vs. //MACH/SHARE),
   * we need to fold the case to canonical form.  This function is
   * supposed to do so.
   */
  apr_status_t filepath_root_case(char **rootpath, char *root, apr_pool_t *p);
  
  
  apr_status_t file_cleanup(void *);
  
  /**
   * Internal function to create a Win32/NT pipe that respects some async
   * timeout options.
   */
  apr_status_t apr_create_nt_pipe(apr_file_t **in, apr_file_t **out, 
                                  BOOLEAN bAsyncRead, BOOLEAN bAsyncWrite, 
                                  apr_pool_t *p);
  #endif  /* ! FILE_IO_H */
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_inherit.h
  
  Index: apr_arch_inherit.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef INHERIT_H
  #define INHERIT_H
  
  #include "apr_inherit.h"
  
  #define APR_INHERIT (1 << 24)    /* Must not conflict with other bits */
  
  #define APR_IMPLEMENT_INHERIT_SET(name, flag, pool, cleanup)        \
  APR_DECLARE(apr_status_t) apr_##name##_inherit_set(apr_##name##_t *the##name) \
  {                                                                   \
      IF_WIN_OS_IS_UNICODE                                            \
      {                                                               \
          if (!SetHandleInformation(the##name->filehand,              \
                                    HANDLE_FLAG_INHERIT,              \
                                    HANDLE_FLAG_INHERIT))             \
              return apr_get_os_error();                              \
      }                                                               \
      ELSE_WIN_OS_IS_ANSI                                             \
      {                                                               \
          HANDLE temp, hproc = GetCurrentProcess();                   \
          if (!DuplicateHandle(hproc, the##name->filehand,            \
                               hproc, &temp, 0, TRUE,                 \
                               DUPLICATE_SAME_ACCESS))                \
              return apr_get_os_error();                              \
          CloseHandle(the##name->filehand);                           \
          the##name->filehand = temp;                                 \
      }                                                               \
      return APR_SUCCESS;                                             \
  }                                                                   \
  /* Deprecated */                                                    \
  APR_DECLARE(void) apr_##name##_set_inherit(apr_##name##_t *the##name) \
  {                                                                   \
      apr_##name##_inherit_set(the##name);                            \
  }
  
  #define APR_IMPLEMENT_INHERIT_UNSET(name, flag, pool, cleanup)      \
  APR_DECLARE(apr_status_t) apr_##name##_inherit_unset(apr_##name##_t *the##name)\
  {                                                                   \
      IF_WIN_OS_IS_UNICODE                                            \
      {                                                               \
          if (!SetHandleInformation(the##name->filehand,              \
                                    HANDLE_FLAG_INHERIT, 0))          \
              return apr_get_os_error();                              \
      }                                                               \
      ELSE_WIN_OS_IS_ANSI                                             \
      {                                                               \
          HANDLE temp, hproc = GetCurrentProcess();                   \
          if (!DuplicateHandle(hproc, the##name->filehand,            \
                               hproc, &temp, 0, FALSE,                \
                               DUPLICATE_SAME_ACCESS))                \
              return apr_get_os_error();                              \
          CloseHandle(the##name->filehand);                           \
          the##name->filehand = temp;                                 \
      }                                                               \
      return APR_SUCCESS;                                             \
  }                                                                   \
  /* Deprecated */                                                    \
  APR_DECLARE(void) apr_##name##_unset_inherit(apr_##name##_t *the##name) \
  {                                                                   \
      apr_##name##_inherit_unset(the##name);                          \
  }
  
  #endif	/* ! INHERIT_H */
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_misc.h
  
  Index: apr_arch_misc.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef MISC_H
  #define MISC_H
  
  #include "apr.h"
  #include "apr_portable.h"
  #include "apr_private.h"
  #include "apr_general.h"
  #include "apr_pools.h"
  #include "apr_getopt.h"
  #include "apr_thread_proc.h"
  #include "apr_file_io.h"
  #include "apr_errno.h"
  #include "apr_getopt.h"
  
  #if APR_HAVE_STDIO_H
  #include <stdio.h>
  #endif
  #if APR_HAVE_SIGNAL_H
  #include <signal.h>
  #endif
  #if APR_HAVE_PTHREAD_H
  #include <pthread.h>
  #endif
  
  /* ### create APR_HAVE_* macros for these? */
  #if APR_HAVE_STDLIB_H
  #include <stdlib.h>
  #endif
  #if APR_HAVE_STRING_H
  #include <string.h>
  #endif
  
  struct apr_other_child_rec_t {
      apr_pool_t *p;
      struct apr_other_child_rec_t *next;
      apr_proc_t *proc;
      void (*maintenance) (int, void *, int);
      void *data;
      apr_os_file_t write_fd;
  };
  
  #define WSAHighByte 2
  #define WSALowByte 0
  
  /* start.c and apr_app.c helpers and communication within misc.c
   *
   * They are not for public consumption, although apr_app_init_complete
   * must be an exported symbol to avoid reinitialization.
   */
  extern int APR_DECLARE_DATA apr_app_init_complete;
  
  int apr_wastrtoastr(char const * const * *retarr, 
                      wchar_t const * const *arr, int args);
  
  /* Platform specific designation of run time os version.
   * Gaps allow for specific service pack levels that
   * export new kernel or winsock functions or behavior.
   */
  typedef enum {
          APR_WIN_UNK =       0,
          APR_WIN_UNSUP =     1,
          APR_WIN_95 =       10,
          APR_WIN_95_B =     11,
          APR_WIN_95_OSR2 =  12,
          APR_WIN_98 =       14,
          APR_WIN_98_SE =    16,
          APR_WIN_ME =       18,
  
  	APR_WIN_UNICODE =  20, /* Prior versions support only narrow chars */
  
          APR_WIN_CE_3 =     23, /* CE is an odd beast, not supporting */
                                 /* some pre-NT features, such as the    */
          APR_WIN_NT =       30, /* narrow charset APIs (fooA fns), while  */
          APR_WIN_NT_3_5 =   35, /* not supporting some NT-family features.  */
          APR_WIN_NT_3_51 =  36,
  
          APR_WIN_NT_4 =     40,
          APR_WIN_NT_4_SP2 = 42,
          APR_WIN_NT_4_SP3 = 43,
          APR_WIN_NT_4_SP4 = 44,
          APR_WIN_NT_4_SP5 = 45,
          APR_WIN_NT_4_SP6 = 46,
  
          APR_WIN_2000 =     50,
          APR_WIN_2000_SP1 = 51,
          APR_WIN_2000_SP2 = 52,
          APR_WIN_XP =       60
  } apr_oslevel_e;
  
  extern APR_DECLARE_DATA apr_oslevel_e apr_os_level;
  
  apr_status_t apr_get_oslevel(apr_oslevel_e *);
  
  /* The APR_HAS_ANSI_FS symbol is PRIVATE, and internal to APR.
   * APR only supports char data for filenames.  Like most applications,
   * characters >127 are essentially undefined.  APR_HAS_UNICODE_FS lets
   * the application know that utf-8 is the encoding method of APR, and
   * only incidently hints that we have Wide OS calls.
   *
   * APR_HAS_ANSI_FS is simply an OS flag to tell us all calls must be
   * the unicode eqivilant.
   */
  
  #if defined(_WIN32_WCE) || defined(WINNT)
  #define APR_HAS_ANSI_FS           0
  #else
  #define APR_HAS_ANSI_FS           1
  #endif
  
  /* IF_WIN_OS_IS_UNICODE / ELSE_WIN_OS_IS_ANSI help us keep the code trivial
   * where have runtime tests for unicode-ness, that aren't needed in any
   * build which supports only WINNT or WCE.
   */
  #if APR_HAS_ANSI_FS && APR_HAS_UNICODE_FS
  #define IF_WIN_OS_IS_UNICODE if (apr_os_level >= APR_WIN_UNICODE)
  #define ELSE_WIN_OS_IS_ANSI else
  #else APR_HAS_UNICODE_FS
  #define IF_WIN_OS_IS_UNICODE
  #define ELSE_WIN_OS_IS_ANSI
  #endif /* WINNT */
  
  typedef enum {
      DLL_WINBASEAPI = 0,    // kernel32 From WinBase.h
      DLL_WINADVAPI = 1,     // advapi32 From WinBase.h
      DLL_WINSOCKAPI = 2,    // mswsock  From WinSock.h
      DLL_WINSOCK2API = 3,   // ws2_32   From WinSock2.h
      DLL_SHSTDAPI = 4,      // shell32  From ShellAPI.h
      DLL_NTDLL = 5,         // shell32  From our real kernel
      DLL_defined = 6        // must define as last idx_ + 1
  } apr_dlltoken_e;
  
  FARPROC apr_load_dll_func(apr_dlltoken_e fnLib, char *fnName, int ordinal);
  
  /* The apr_load_dll_func call WILL fault if the function cannot be loaded */
  
  #define APR_DECLARE_LATE_DLL_FUNC(lib, rettype, calltype, fn, ord, args, names) \
      typedef rettype (calltype *apr_winapi_fpt_##fn) args; \
      static apr_winapi_fpt_##fn apr_winapi_pfn_##fn = NULL; \
      __inline rettype apr_winapi_##fn args \
      {   if (!apr_winapi_pfn_##fn) \
              apr_winapi_pfn_##fn = (apr_winapi_fpt_##fn) \
                                        apr_load_dll_func(lib, #fn, ord); \
          return (*(apr_winapi_pfn_##fn)) names; }; \
  
  /* Provide late bound declarations of every API function missing from
   * one or more supported releases of the Win32 API
   *
   * lib is the enumerated token from apr_dlltoken_e, and must correspond
   * to the string table entry in start.c used by the apr_load_dll_func().
   * Token names (attempt to) follow Windows.h declarations prefixed by DLL_
   * in order to facilitate comparison.  Use the exact declaration syntax
   * and names from Windows.h to prevent ambigutity and bugs.
   *
   * rettype and calltype follow the original declaration in Windows.h
   * fn is the true function name - beware Ansi/Unicode #defined macros
   * ord is the ordinal within the library, use 0 if it varies between versions
   * args is the parameter list following the original declaration, in parens
   * names is the parameter list sans data types, enclosed in parens
   *
   * #undef/re#define the Ansi/Unicode generic name to abate confusion
   * In the case of non-text functions, simply #define the original name
   */
  
  #if !defined(_WIN32_WCE) && !defined(WINNT)
  
  #ifdef GetFileAttributesExA
  #undef GetFileAttributesExA
  #endif
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExA, 0, (
      IN LPCSTR lpFileName,
      IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
      OUT LPVOID lpFileInformation),
      (lpFileName, fInfoLevelId, lpFileInformation));
  #define GetFileAttributesExA apr_winapi_GetFileAttributesExA
  #undef GetFileAttributesEx
  #define GetFileAttributesEx apr_winapi_GetFileAttributesExA
  
  #ifdef GetFileAttributesExW
  #undef GetFileAttributesExW
  #endif
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, GetFileAttributesExW, 0, (
      IN LPCWSTR lpFileName,
      IN GET_FILEEX_INFO_LEVELS fInfoLevelId,
      OUT LPVOID lpFileInformation),
      (lpFileName, fInfoLevelId, lpFileInformation));
  #define GetFileAttributesExW apr_winapi_GetFileAttributesExW
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, CancelIo, 0, (
      IN HANDLE hFile),
      (hFile));
  #define CancelIo apr_winapi_CancelIo
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, TryEnterCriticalSection, 0, (
      LPCRITICAL_SECTION lpCriticalSection),
      (lpCriticalSection));
  #define TryEnterCriticalSection apr_winapi_TryEnterCriticalSection
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINBASEAPI, BOOL, WINAPI, SwitchToThread, 0, (
      void),
      ());
  #define SwitchToThread apr_winapi_SwitchToThread
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetEffectiveRightsFromAclW, 0, (
      IN PACL pacl,
      IN PTRUSTEE_W pTrustee,
      OUT PACCESS_MASK pAccessRights),
      (pacl, pTrustee, pAccessRights));
  #define GetEffectiveRightsFromAclW apr_winapi_GetEffectiveRightsFromAclW
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetNamedSecurityInfoW, 0, (
      IN LPWSTR pObjectName,
      IN SE_OBJECT_TYPE ObjectType,
      IN SECURITY_INFORMATION SecurityInfo,
      OUT PSID *ppsidOwner,
      OUT PSID *ppsidGroup,
      OUT PACL *ppDacl,
      OUT PACL *ppSacl,
      OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
      (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
  	 ppDacl, ppSacl, ppSecurityDescriptor));
  #define GetNamedSecurityInfoW apr_winapi_GetNamedSecurityInfoW
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetNamedSecurityInfoA, 0, (
      IN LPSTR pObjectName,
      IN SE_OBJECT_TYPE ObjectType,
      IN SECURITY_INFORMATION SecurityInfo,
      OUT PSID *ppsidOwner,
      OUT PSID *ppsidGroup,
      OUT PACL *ppDacl,
      OUT PACL *ppSacl,
      OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
      (pObjectName, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
  	 ppDacl, ppSacl, ppSecurityDescriptor));
  #define GetNamedSecurityInfoA apr_winapi_GetNamedSecurityInfoA
  #undef GetNamedSecurityInfo
  #define GetNamedSecurityInfo apr_winapi_GetNamedSecurityInfoA
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_WINADVAPI, BOOL, WINAPI, GetSecurityInfo, 0, (
      IN HANDLE handle,
      IN SE_OBJECT_TYPE ObjectType,
      IN SECURITY_INFORMATION SecurityInfo,
      OUT PSID *ppsidOwner,
      OUT PSID *ppsidGroup,
      OUT PACL *ppDacl,
      OUT PACL *ppSacl,
      OUT PSECURITY_DESCRIPTOR *ppSecurityDescriptor),
      (handle, ObjectType, SecurityInfo, ppsidOwner, ppsidGroup, 
  	 ppDacl, ppSacl, ppSecurityDescriptor));
  #define GetSecurityInfo apr_winapi_GetSecurityInfo
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_SHSTDAPI, LPWSTR *, WINAPI, CommandLineToArgvW, 0, (
      LPCWSTR lpCmdLine, 
      int *pNumArgs),
      (lpCmdLine, pNumArgs));
  #define CommandLineToArgvW apr_winapi_CommandLineToArgvW
  
  #endif /* !defined(_WIN32_WCE) && !defined(WINNT) */
  
  #if !defined(_WIN32_WCE)
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryTimerResolution, 0, (
      ULONG *pMaxRes,  /* Minimum NS Resolution */
      ULONG *pMinRes,  /* Maximum NS Resolution */
      ULONG *pCurRes), /* Current NS Resolution */
      (pMaxRes, pMinRes, pCurRes));
  #define QueryTimerResolution apr_winapi_NtQueryTimerResolution
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtSetTimerResolution, 0, (
      ULONG ReqRes,    /* Requested NS Clock Resolution */
      BOOL  Acquire,   /* Aquire (1) or Release (0) our interest */
      ULONG *pNewRes), /* The NS Clock Resolution granted */
      (ReqRes, Acquire, pNewRes));
  #define SetTimerResolution apr_winapi_NtSetTimerResolution
  
  /* ### These are ULONG_PTR values, but that's int32 for all we care
   * until the Win64 port is prepared.
   */
  typedef struct PBI {
      DWORD ExitStatus;
      PVOID PebBaseAddress;
      ULONG AffinityMask;
      LONG  BasePriority;
      ULONG UniqueProcessId;
      ULONG InheritedFromUniqueProcessId;
  } PBI, *PPBI;
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryInformationProcess, 0, (
      HANDLE hProcess,  /* Obvious */
      INT   info,       /* Use 0 for PBI documented above */
      PVOID pPI,        /* The PIB buffer */
      ULONG LenPI,      /* Use sizeof(PBI) */
      ULONG *pSizePI),  /* returns pPI buffer used (may pass NULL) */
      (hProcess, info, pPI, LenPI, pSizePI));
  #define QueryInformationProcess apr_winapi_NtQueryInformationProcess
  
  APR_DECLARE_LATE_DLL_FUNC(DLL_NTDLL, DWORD, WINAPI, NtQueryObject, 0, (
      HANDLE hObject,   /* Obvious */
      INT   info,       /* Use 0 for PBI documented above */
      PVOID pOI,        /* The PIB buffer */
      ULONG LenOI,      /* Use sizeof(PBI) */
      ULONG *pSizeOI),  /* returns pPI buffer used (may pass NULL) */
      (hObject, info, pOI, LenOI, pSizeOI));
  #define QueryObject apr_winapi_NtQueryObject
  
  #endif /* !defined(_WIN32_WCE) */
  
  #endif  /* ! MISC_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_networkio.h
  
  Index: apr_arch_networkio.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef NETWORK_IO_H
  #define NETWORK_IO_H
  
  #include "apr_network_io.h"
  #include "apr_general.h"
  
  struct apr_socket_t {
      apr_pool_t         *cntxt;
      SOCKET              socketdes;
      int                 type; /* SOCK_STREAM, SOCK_DGRAM */
      int                 protocol;
      apr_sockaddr_t     *local_addr;
      apr_sockaddr_t     *remote_addr;
      int                 timeout_ms; /* MUST MATCH if timeout > 0 */
      apr_interval_time_t timeout;
      apr_int32_t         disconnected;
      int                 local_port_unknown;
      int                 local_interface_unknown;
      int                 remote_addr_unknown;
      apr_int32_t         netmask;
      apr_int32_t         inherit;
  };
  
  #ifdef _WIN32_WCE
  #ifndef WSABUF
  typedef struct _WSABUF {
      u_long      len;     /* the length of the buffer */
      char FAR *  buf;     /* the pointer to the buffer */
  } WSABUF, FAR * LPWSABUF;
  #endif
  #endif
  
  apr_status_t status_from_res_error(int);
  
  const char *apr_inet_ntop(int af, const void *src, char *dst, apr_size_t size);
  int apr_inet_pton(int af, const char *src, void *dst);
  void apr_sockaddr_vars_set(apr_sockaddr_t *, int, apr_port_t);
  
  #define apr_is_option_set(mask, option)  ((mask & option) ==option)
  #define apr_set_option(mask, option, on) \
      do {                                 \
          if (on)                          \
              *mask |= option;             \
          else                             \
              *mask &= ~option;            \
      } while (0)
  
  #endif  /* ! NETWORK_IO_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_proc_mutex.h
  
  Index: apr_arch_proc_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef PROC_MUTEX_H
  #define PROC_MUTEX_H
  
  #include "apr_proc_mutex.h"
  
  struct apr_proc_mutex_t {
      apr_pool_t *pool;
      HANDLE handle;
      const char *fname;
  };
  
  #endif  /* PROC_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_thread_cond.h
  
  Index: apr_arch_thread_cond.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_COND_H
  #define THREAD_COND_H
  
  #include "apr_thread_cond.h"
  
  struct apr_thread_cond_t {
      apr_pool_t *pool;
      HANDLE event;
      HANDLE mutex;
      int signal_all;
      int num_waiting;
      int signalled;
  };
  
  #endif  /* THREAD_COND_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_thread_mutex.h
  
  Index: apr_arch_thread_mutex.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_MUTEX_H
  #define THREAD_MUTEX_H
  
  #include "apr_pools.h"
  
  typedef enum thread_mutex_type {
      thread_mutex_critical_section,
      thread_mutex_unnested_event,
      thread_mutex_nested_mutex
  } thread_mutex_type;
  
  /* handle applies only to unnested_event on all platforms 
   * and nested_mutex on Win9x only.  Otherwise critical_section 
   * is used for NT nexted mutexes providing optimal performance.
   */
  struct apr_thread_mutex_t {
      apr_pool_t       *pool;
      thread_mutex_type type;
      HANDLE            handle;
      CRITICAL_SECTION  section;
  };
  
  #endif  /* THREAD_MUTEX_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_thread_rwlock.h
  
  Index: apr_arch_thread_rwlock.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef THREAD_RWLOCK_H
  #define THREAD_RWLOCK_H
  
  #include "apr_thread_rwlock.h"
  
  struct apr_thread_rwlock_t {
      apr_pool_t *pool;
      HANDLE readevent;
      HANDLE mutex;
      HANDLE writemutex;
      int counter;
      int wrcounter;
  };
  
  #endif  /* THREAD_RWLOCK_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_threadproc.h
  
  Index: apr_arch_threadproc.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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_private.h"
  #include "apr_thread_proc.h"
  #include "apr_file_io.h"
  
  #ifndef THREAD_PROC_H
  #define THREAD_PROC_H
  
  #define SHELL_PATH "cmd.exe"
  
  struct apr_thread_t {
      apr_pool_t *pool;
      HANDLE td;
      apr_int32_t cancel;
      apr_int32_t cancel_how;
      void *data;
      apr_thread_start_t func;
      apr_status_t exitval;
  };
  
  struct apr_threadattr_t {
      apr_pool_t *pool;
      apr_int32_t detach;
  };
  
  struct apr_threadkey_t {
      apr_pool_t *pool;
      DWORD key;
  };
  
  struct apr_procattr_t {
      apr_pool_t *pool;
      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;
  };
  
  struct apr_thread_once_t {
      long value;
  };
  
  #endif  /* ! THREAD_PROC_H */
  
  
  
  
  1.1                  apr/include/arch/win32/apr_arch_utf8.h
  
  Index: apr_arch_utf8.h
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2003 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/>.
   */
  
  #ifndef UTF8_H
  #define UTF8_H
  
  #include "apr.h"
  #include "apr_lib.h"
  #include "apr_errno.h"
  
  /* If we ever support anything more exciting than char... this could move.
   */
  typedef apr_uint16_t apr_wchar_t;
  
  /**
   * An APR internal function for fast utf-8 octet-encoded Unicode conversion
   * to the ucs-2 wide Unicode format.  This function is used for filename and 
   * other resource conversions for platforms providing native Unicode support.
   *
   * @tip Only the errors APR_EINVAL and APR_INCOMPLETE may occur, the former
   * when the character code is invalid (in or out of context) and the later
   * when more characters were expected, but insufficient characters remain.
   */
  APR_DECLARE(apr_status_t) apr_conv_utf8_to_ucs2(const char *in, 
                                                  apr_size_t *inbytes,
                                                  apr_wchar_t *out, 
                                                  apr_size_t *outwords);
  
  /**
   * An APR internal function for fast ucs-2 wide Unicode format conversion to 
   * the utf-8 octet-encoded Unicode.  This function is used for filename and 
   * other resource conversions for platforms providing native Unicode support.
   *
   * @tip Only the errors APR_EINVAL and APR_INCOMPLETE may occur, the former
   * when the character code is invalid (in or out of context) and the later
   * when more words were expected, but insufficient words remain.
   */
  APR_DECLARE(apr_status_t) apr_conv_ucs2_to_utf8(const apr_wchar_t *in, 
                                                  apr_size_t *inwords,
                                                  char *out, 
                                                  apr_size_t *outbytes);
  
  #endif /* def UTF8_H */
  
  
  
  1.10      +1 -1      apr/locks/beos/proc_mutex.c
  
  Index: proc_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/beos/proc_mutex.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- proc_mutex.c	1 Jan 2003 00:01:50 -0000	1.9
  +++ proc_mutex.c	6 Jan 2003 23:44:29 -0000	1.10
  @@ -56,7 +56,7 @@
    * Stephen Beaulieu <hippo@be.com>
    */
    
  -#include "beos/proc_mutex.h"
  +#include "beos/apr_arch_proc_mutex.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.8       +2 -2      apr/locks/beos/thread_cond.c
  
  Index: thread_cond.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/beos/thread_cond.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- thread_cond.c	1 Jan 2003 00:01:50 -0000	1.7
  +++ thread_cond.c	6 Jan 2003 23:44:30 -0000	1.8
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "beos/thread_mutex.h"
  -#include "beos/thread_cond.h"
  +#include "beos/apr_arch_thread_mutex.h"
  +#include "beos/apr_arch_thread_cond.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.10      +1 -1      apr/locks/beos/thread_mutex.c
  
  Index: thread_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/beos/thread_mutex.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- thread_mutex.c	1 Jan 2003 00:01:50 -0000	1.9
  +++ thread_mutex.c	6 Jan 2003 23:44:30 -0000	1.10
  @@ -56,7 +56,7 @@
    * Stephen Beaulieu <hippo@be.com>
    */
    
  -#include "beos/thread_mutex.h"
  +#include "beos/apr_arch_thread_mutex.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.6       +1 -1      apr/locks/beos/thread_rwlock.c
  
  Index: thread_rwlock.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/beos/thread_rwlock.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread_rwlock.c	1 Jan 2003 00:01:50 -0000	1.5
  +++ thread_rwlock.c	6 Jan 2003 23:44:30 -0000	1.6
  @@ -56,7 +56,7 @@
    * Stephen Beaulieu <hippo@be.com>
    */
    
  -#include "beos/thread_rwlock.h"
  +#include "beos/apr_arch_thread_rwlock.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.11      +2 -2      apr/locks/netware/proc_mutex.c
  
  Index: proc_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/netware/proc_mutex.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- proc_mutex.c	1 Jan 2003 00:01:50 -0000	1.10
  +++ proc_mutex.c	6 Jan 2003 23:44:30 -0000	1.11
  @@ -55,8 +55,8 @@
   #include "apr.h"
   #include "apr_private.h"
   #include "apr_portable.h"
  -#include "proc_mutex.h"
  -#include "thread_mutex.h"
  +#include "apr_arch_proc_mutex.h"
  +#include "apr_arch_thread_mutex.h"
   
   APR_DECLARE(apr_status_t) apr_proc_mutex_create(apr_proc_mutex_t **mutex,
                                                   const char *fname,
  
  
  
  1.9       +2 -2      apr/locks/netware/thread_cond.c
  
  Index: thread_cond.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/netware/thread_cond.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- thread_cond.c	1 Jan 2003 00:01:51 -0000	1.8
  +++ thread_cond.c	6 Jan 2003 23:44:30 -0000	1.9
  @@ -58,8 +58,8 @@
   #include "apr_private.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  -#include "thread_mutex.h"
  -#include "thread_cond.h"
  +#include "apr_arch_thread_mutex.h"
  +#include "apr_arch_thread_cond.h"
   #include "apr_portable.h"
   
   static apr_status_t thread_cond_cleanup(void *data)
  
  
  
  1.10      +1 -1      apr/locks/netware/thread_mutex.c
  
  Index: thread_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/netware/thread_mutex.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- thread_mutex.c	1 Jan 2003 00:01:51 -0000	1.9
  +++ thread_mutex.c	6 Jan 2003 23:44:30 -0000	1.10
  @@ -56,7 +56,7 @@
   #include "apr_private.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  -#include "thread_mutex.h"
  +#include "apr_arch_thread_mutex.h"
   #include "apr_portable.h"
   
   static apr_status_t thread_mutex_cleanup(void *data)
  
  
  
  1.6       +1 -1      apr/locks/netware/thread_rwlock.c
  
  Index: thread_rwlock.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/netware/thread_rwlock.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread_rwlock.c	1 Jan 2003 00:01:51 -0000	1.5
  +++ thread_rwlock.c	6 Jan 2003 23:44:30 -0000	1.6
  @@ -56,7 +56,7 @@
   #include "apr_private.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  -#include "thread_rwlock.h"
  +#include "apr_arch_thread_rwlock.h"
   #include "apr_portable.h"
   
   static apr_status_t thread_rwlock_cleanup(void *data)
  
  
  
  1.12      +2 -2      apr/locks/os2/proc_mutex.c
  
  Index: proc_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/os2/proc_mutex.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- proc_mutex.c	1 Jan 2003 00:01:51 -0000	1.11
  +++ proc_mutex.c	6 Jan 2003 23:44:30 -0000	1.12
  @@ -56,8 +56,8 @@
   #include "apr_lib.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  -#include "proc_mutex.h"
  -#include "fileio.h"
  +#include "apr_arch_proc_mutex.h"
  +#include "apr_arch_fileio.h"
   #include <string.h>
   #include <stddef.h>
   
  
  
  
  1.6       +3 -3      apr/locks/os2/thread_cond.c
  
  Index: thread_cond.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/os2/thread_cond.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread_cond.c	1 Jan 2003 00:01:51 -0000	1.5
  +++ thread_cond.c	6 Jan 2003 23:44:30 -0000	1.6
  @@ -56,9 +56,9 @@
   #include "apr_lib.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  -#include "thread_mutex.h"
  -#include "thread_cond.h"
  -#include "fileio.h"
  +#include "apr_arch_thread_mutex.h"
  +#include "apr_arch_thread_cond.h"
  +#include "apr_arch_fileio.h"
   #include <string.h>
   
   APR_DECLARE(apr_status_t) apr_thread_cond_create(apr_thread_cond_t **cond,
  
  
  
  1.9       +2 -2      apr/locks/os2/thread_mutex.c
  
  Index: thread_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/os2/thread_mutex.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- thread_mutex.c	1 Jan 2003 00:01:51 -0000	1.8
  +++ thread_mutex.c	6 Jan 2003 23:44:30 -0000	1.9
  @@ -56,8 +56,8 @@
   #include "apr_lib.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  -#include "thread_mutex.h"
  -#include "fileio.h"
  +#include "apr_arch_thread_mutex.h"
  +#include "apr_arch_fileio.h"
   #include <string.h>
   #include <stddef.h>
   
  
  
  
  1.6       +2 -2      apr/locks/os2/thread_rwlock.c
  
  Index: thread_rwlock.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/os2/thread_rwlock.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- thread_rwlock.c	1 Jan 2003 00:01:51 -0000	1.5
  +++ thread_rwlock.c	6 Jan 2003 23:44:31 -0000	1.6
  @@ -56,8 +56,8 @@
   #include "apr_lib.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  -#include "thread_rwlock.h"
  -#include "fileio.h"
  +#include "apr_arch_thread_rwlock.h"
  +#include "apr_arch_fileio.h"
   #include <string.h>
   
   static apr_status_t thread_rwlock_cleanup(void *therwlock)
  
  
  
  1.10      +1 -1      apr/locks/unix/global_mutex.c
  
  Index: global_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/unix/global_mutex.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- global_mutex.c	1 Jan 2003 00:01:51 -0000	1.9
  +++ global_mutex.c	6 Jan 2003 23:44:31 -0000	1.10
  @@ -54,7 +54,7 @@
   
   #include "apr.h"
   #include "apr_strings.h"
  -#include "global_mutex.h"
  +#include "apr_arch_global_mutex.h"
   #include "apr_proc_mutex.h"
   #include "apr_thread_mutex.h"
   #include "apr_portable.h"
  
  
  
  1.26      +2 -2      apr/locks/unix/proc_mutex.c
  
  Index: proc_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/unix/proc_mutex.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- proc_mutex.c	1 Jan 2003 00:01:51 -0000	1.25
  +++ proc_mutex.c	6 Jan 2003 23:44:31 -0000	1.26
  @@ -54,8 +54,8 @@
   
   #include "apr.h"
   #include "apr_strings.h"
  -#include "proc_mutex.h"
  -#include "fileio.h" /* for apr_mkstemp() */
  +#include "apr_arch_proc_mutex.h"
  +#include "apr_arch_fileio.h" /* for apr_mkstemp() */
   
   APR_DECLARE(apr_status_t) apr_proc_mutex_destroy(apr_proc_mutex_t *mutex)
   {
  
  
  
  1.9       +2 -2      apr/locks/unix/thread_cond.c
  
  Index: thread_cond.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/unix/thread_cond.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- thread_cond.c	1 Jan 2003 00:01:51 -0000	1.8
  +++ thread_cond.c	6 Jan 2003 23:44:31 -0000	1.9
  @@ -56,8 +56,8 @@
   
   #if APR_HAS_THREADS
   
  -#include "thread_mutex.h"
  -#include "thread_cond.h"
  +#include "apr_arch_thread_mutex.h"
  +#include "apr_arch_thread_cond.h"
   
   static apr_status_t thread_cond_cleanup(void *data)
   {
  
  
  
  1.15      +1 -1      apr/locks/unix/thread_mutex.c
  
  Index: thread_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/unix/thread_mutex.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- thread_mutex.c	1 Jan 2003 00:01:51 -0000	1.14
  +++ thread_mutex.c	6 Jan 2003 23:44:31 -0000	1.15
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "thread_mutex.h"
  +#include "apr_arch_thread_mutex.h"
   #define APR_WANT_MEMFUNC
   #include "apr_want.h"
   
  
  
  
  1.8       +1 -1      apr/locks/unix/thread_rwlock.c
  
  Index: thread_rwlock.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/unix/thread_rwlock.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- thread_rwlock.c	1 Jan 2003 00:01:51 -0000	1.7
  +++ thread_rwlock.c	6 Jan 2003 23:44:31 -0000	1.8
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "thread_rwlock.h"
  +#include "apr_arch_thread_rwlock.h"
   #include "apr_private.h"
   
   #if APR_HAS_THREADS
  
  
  
  1.12      +2 -2      apr/locks/win32/proc_mutex.c
  
  Index: proc_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/win32/proc_mutex.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- proc_mutex.c	1 Jan 2003 00:01:51 -0000	1.11
  +++ proc_mutex.c	6 Jan 2003 23:44:31 -0000	1.12
  @@ -57,8 +57,8 @@
   #include "apr_general.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
  -#include "proc_mutex.h"
  -#include "misc.h"
  +#include "apr_arch_proc_mutex.h"
  +#include "apr_arch_misc.h"
   
   static apr_status_t proc_mutex_cleanup(void *mutex_)
   {
  
  
  
  1.11      +2 -2      apr/locks/win32/thread_cond.c
  
  Index: thread_cond.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/win32/thread_cond.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- thread_cond.c	1 Jan 2003 00:01:51 -0000	1.10
  +++ thread_cond.c	6 Jan 2003 23:44:31 -0000	1.11
  @@ -56,8 +56,8 @@
   #include "apr_private.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  -#include "win32/thread_mutex.h"
  -#include "win32/thread_cond.h"
  +#include "win32/apr_arch_thread_mutex.h"
  +#include "win32/apr_arch_thread_cond.h"
   #include "apr_portable.h"
   
   static apr_status_t thread_cond_cleanup(void *data)
  
  
  
  1.12      +2 -2      apr/locks/win32/thread_mutex.c
  
  Index: thread_mutex.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/win32/thread_mutex.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- thread_mutex.c	1 Jan 2003 00:01:51 -0000	1.11
  +++ thread_mutex.c	6 Jan 2003 23:44:31 -0000	1.12
  @@ -56,10 +56,10 @@
   #include "apr_private.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  -#include "thread_mutex.h"
  +#include "apr_arch_thread_mutex.h"
   #include "apr_thread_mutex.h"
   #include "apr_portable.h"
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   
   static apr_status_t thread_mutex_cleanup(void *data)
   {
  
  
  
  1.8       +1 -1      apr/locks/win32/thread_rwlock.c
  
  Index: thread_rwlock.c
  ===================================================================
  RCS file: /home/cvs/apr/locks/win32/thread_rwlock.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- thread_rwlock.c	1 Jan 2003 00:01:51 -0000	1.7
  +++ thread_rwlock.c	6 Jan 2003 23:44:31 -0000	1.8
  @@ -56,7 +56,7 @@
   #include "apr_private.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  -#include "win32/thread_rwlock.h"
  +#include "win32/apr_arch_thread_rwlock.h"
   #include "apr_portable.h"
   
   static apr_status_t thread_rwlock_cleanup(void *data)
  
  
  
  1.10      +3 -3      apr/misc/netware/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/netware/start.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- start.c	1 Jan 2003 00:01:52 -0000	1.9
  +++ start.c	6 Jan 2003 23:44:31 -0000	1.10
  @@ -57,9 +57,9 @@
   #include "apr_pools.h"
   #include "apr_signal.h"
   
  -#include "misc.h"       /* for WSAHighByte / WSALowByte */
  -#include "proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
  -#include "internal_time.h"
  +#include "apr_arch_misc.h"       /* for WSAHighByte / WSALowByte */
  +#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
  +#include "apr_arch_internal_time.h"
   
   
   APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
  
  
  
  1.53      +1 -1      apr/misc/unix/errorcodes.c
  
  Index: errorcodes.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/errorcodes.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- errorcodes.c	1 Jan 2003 00:01:52 -0000	1.52
  +++ errorcodes.c	6 Jan 2003 23:44:32 -0000	1.53
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
   #include "apr_dso.h"
  
  
  
  1.40      +1 -1      apr/misc/unix/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/getopt.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- getopt.c	20 Nov 2002 03:50:21 -0000	1.39
  +++ getopt.c	6 Jan 2003 23:44:32 -0000	1.40
  @@ -31,7 +31,7 @@
    * SUCH DAMAGE.
    */
   
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   #include "apr_strings.h"
   #include "apr_lib.h"
   
  
  
  
  1.30      +3 -3      apr/misc/unix/otherchild.c
  
  Index: otherchild.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/otherchild.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- otherchild.c	3 Jan 2003 19:14:13 -0000	1.29
  +++ otherchild.c	6 Jan 2003 23:44:32 -0000	1.30
  @@ -56,9 +56,9 @@
   
   #if APR_HAS_OTHER_CHILD
   
  -#include "misc.h"
  -#include "threadproc.h"
  -#include "fileio.h"
  +#include "apr_arch_misc.h"
  +#include "apr_arch_threadproc.h"
  +#include "apr_arch_fileio.h"
   #ifdef HAVE_TIME_H
   #include <sys/time.h>
   #endif
  
  
  
  1.20      +1 -1      apr/misc/unix/rand.c
  
  Index: rand.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/rand.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- rand.c	1 Jan 2003 00:01:52 -0000	1.19
  +++ rand.c	6 Jan 2003 23:44:32 -0000	1.20
  @@ -56,7 +56,7 @@
   #include "apr_want.h"
   #include "apr_general.h"
   
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   #include <sys/stat.h>
   #if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
  
  
  
  1.70      +2 -2      apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/unix/start.c,v
  retrieving revision 1.69
  retrieving revision 1.70
  diff -u -r1.69 -r1.70
  --- start.c	1 Jan 2003 00:01:52 -0000	1.69
  +++ start.c	6 Jan 2003 23:44:32 -0000	1.70
  @@ -58,8 +58,8 @@
   #include "apr_signal.h"
   #include "apr_atomic.h"
   
  -#include "proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
  -#include "internal_time.h"
  +#include "apr_arch_proc_mutex.h" /* for apr_proc_mutex_unix_setup_lock() */
  +#include "apr_arch_internal_time.h"
   
   
   APR_DECLARE(apr_status_t) apr_app_initialize(int *argc, 
  
  
  
  1.15      +2 -2      apr/misc/win32/apr_app.c
  
  Index: apr_app.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/apr_app.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_app.c	1 Jan 2003 00:01:52 -0000	1.14
  +++ apr_app.c	6 Jan 2003 23:44:33 -0000	1.15
  @@ -75,10 +75,10 @@
   #include "ShellAPI.h"
   #include "crtdbg.h"
   #include "wchar.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "assert.h"
   #include "apr_private.h"
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   
   /* This symbol is _private_, although it must be exported.
    */
  
  
  
  1.7       +2 -2      apr/misc/win32/internal.c
  
  Index: internal.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/internal.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- internal.c	1 Jan 2003 00:01:53 -0000	1.6
  +++ internal.c	6 Jan 2003 23:44:33 -0000	1.7
  @@ -54,8 +54,8 @@
   
   #include "apr_private.h"
   
  -#include "misc.h"
  -#include "fileio.h"
  +#include "apr_arch_misc.h"
  +#include "apr_arch_fileio.h"
   #include <crtdbg.h>
   #include <assert.h>
   
  
  
  
  1.18      +2 -2      apr/misc/win32/misc.c
  
  Index: misc.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/misc.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- misc.c	1 Jan 2003 00:01:53 -0000	1.17
  +++ misc.c	6 Jan 2003 23:44:33 -0000	1.18
  @@ -53,9 +53,9 @@
    */
   
   #include "apr_private.h"
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   #include "crtdbg.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "assert.h"
   #include "apr_lib.h"
   
  
  
  
  1.20      +1 -1      apr/misc/win32/rand.c
  
  Index: rand.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/rand.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- rand.c	1 Jan 2003 00:01:53 -0000	1.19
  +++ rand.c	6 Jan 2003 23:44:33 -0000	1.20
  @@ -56,7 +56,7 @@
   #include "apr_private.h"
   #include "apr_general.h"
   #include "apr_portable.h"
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   #include <wincrypt.h>
   
   
  
  
  
  1.44      +2 -2      apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/start.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- start.c	1 Jan 2003 00:01:53 -0000	1.43
  +++ start.c	6 Jan 2003 23:44:33 -0000	1.44
  @@ -58,9 +58,9 @@
   #include "apr_signal.h"
   #include "ShellAPI.h"
   
  -#include "misc.h"       /* for WSAHighByte / WSALowByte */
  +#include "apr_arch_misc.h"       /* for WSAHighByte / WSALowByte */
   #include "wchar.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "crtdbg.h"
   #include "assert.h"
   
  
  
  
  1.3       +1 -1      apr/misc/win32/utf8.c
  
  Index: utf8.c
  ===================================================================
  RCS file: /home/cvs/apr/misc/win32/utf8.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- utf8.c	1 Jan 2003 00:01:53 -0000	1.2
  +++ utf8.c	6 Jan 2003 23:44:33 -0000	1.3
  @@ -55,7 +55,7 @@
   #include "apr.h"
   #include "apr_private.h"
   #include "apr_errno.h"
  -#include "utf8.h"
  +#include "apr_arch_utf8.h"
   
   /* Implement the design principal specified by RFC 2718 2.2.5 
    * Guidelines for new URL Schemes - within the APR.
  
  
  
  1.46      +1 -1      apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apr/mmap/unix/mmap.c,v
  retrieving revision 1.45
  retrieving revision 1.46
  diff -u -r1.45 -r1.46
  --- mmap.c	1 Jan 2003 00:01:53 -0000	1.45
  +++ mmap.c	6 Jan 2003 23:44:34 -0000	1.46
  @@ -58,7 +58,7 @@
   #include "apr_strings.h"
   #include "apr_mmap.h"
   #include "apr_errno.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_portable.h"
   
   /* System headers required for the mmap library */
  
  
  
  1.17      +1 -1      apr/mmap/win32/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apr/mmap/win32/mmap.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- mmap.c	1 Jan 2003 00:01:53 -0000	1.16
  +++ mmap.c	6 Jan 2003 23:44:34 -0000	1.17
  @@ -57,7 +57,7 @@
   #include "apr_general.h"
   #include "apr_mmap.h"
   #include "apr_errno.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include "apr_portable.h"
   #include "apr_strings.h"
   
  
  
  
  1.29      +1 -1      apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- sendrecv.c	1 Jan 2003 00:01:53 -0000	1.28
  +++ sendrecv.c	6 Jan 2003 23:44:34 -0000	1.29
  @@ -56,7 +56,7 @@
   #if BEOS_BONE /* BONE uses the unix code - woohoo */
   #include "../unix/sendrecv.c"
   #else
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_time.h"
   
   apr_status_t apr_wait_for_io_or_timeout(apr_socket_t *sock, int for_read)
  
  
  
  1.10      +1 -1      apr/network_io/os2/os2calls.c
  
  Index: os2calls.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/os2calls.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- os2calls.c	1 Jan 2003 00:01:53 -0000	1.9
  +++ os2calls.c	6 Jan 2003 23:44:34 -0000	1.10
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_network_io.h"
   #include "apr_portable.h"
   #include "apr_general.h"
  
  
  
  1.27      +1 -1      apr/network_io/os2/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sendrecv.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- sendrecv.c	1 Jan 2003 00:01:53 -0000	1.26
  +++ sendrecv.c	6 Jan 2003 23:44:34 -0000	1.27
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_errno.h"
   #include "apr_general.h"
   #include "apr_network_io.h"
  
  
  
  1.10      +1 -1      apr/network_io/os2/sendrecv_udp.c
  
  Index: sendrecv_udp.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sendrecv_udp.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sendrecv_udp.c	1 Jan 2003 00:01:53 -0000	1.9
  +++ sendrecv_udp.c	6 Jan 2003 23:44:34 -0000	1.10
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_errno.h"
   #include "apr_general.h"
   #include "apr_network_io.h"
  
  
  
  1.63      +3 -3      apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sockets.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- sockets.c	1 Jan 2003 00:01:53 -0000	1.62
  +++ sockets.c	6 Jan 2003 23:44:34 -0000	1.63
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  -#include "inherit.h"
  +#include "apr_arch_networkio.h"
  +#include "apr_arch_inherit.h"
   #include "apr_network_io.h"
   #include "apr_general.h"
   #include "apr_portable.h"
  @@ -65,7 +65,7 @@
   #include <netinet/in.h>
   #include <arpa/inet.h>
   #include <netdb.h>
  -#include "os2calls.h"
  +#include "apr_arch_os2calls.h"
   
   static apr_status_t socket_cleanup(void *sock)
   {
  
  
  
  1.32      +1 -1      apr/network_io/os2/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/os2/sockopt.c,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- sockopt.c	1 Jan 2003 00:01:53 -0000	1.31
  +++ sockopt.c	6 Jan 2003 23:44:34 -0000	1.32
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_network_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.19      +1 -1      apr/network_io/unix/inet_ntop.c
  
  Index: inet_ntop.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/inet_ntop.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- inet_ntop.c	10 Jul 2002 06:01:12 -0000	1.18
  +++ inet_ntop.c	6 Jan 2003 23:44:35 -0000	1.19
  @@ -15,7 +15,7 @@
    */
   
   #include "apr_private.h"
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_strings.h"
   
   #if APR_HAVE_SYS_TYPES_H
  
  
  
  1.7       +1 -1      apr/network_io/unix/inet_pton.c
  
  Index: inet_pton.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/inet_pton.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- inet_pton.c	12 Feb 2002 21:57:13 -0000	1.6
  +++ inet_pton.c	6 Jan 2003 23:44:35 -0000	1.7
  @@ -15,7 +15,7 @@
    */
   
   #include "apr_private.h"
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   
   #if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
  
  
  
  1.94      +2 -2      apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.93
  retrieving revision 1.94
  diff -u -r1.93 -r1.94
  --- sendrecv.c	1 Jan 2003 00:01:53 -0000	1.93
  +++ sendrecv.c	6 Jan 2003 23:44:35 -0000	1.94
  @@ -52,12 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_support.h"
   
   #if APR_HAS_SENDFILE
   /* This file is needed to allow us access to the apr_file_t internals. */
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #endif /* APR_HAS_SENDFILE */
   
   /* sys/sysctl.h is only needed on FreeBSD for include_hdrs_in_length() */
  
  
  
  1.35      +1 -1      apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- sockaddr.c	1 Jan 2003 00:01:54 -0000	1.34
  +++ sockaddr.c	6 Jan 2003 23:44:35 -0000	1.35
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_strings.h"
   #include "apr.h"
   #include "apr_lib.h"
  
  
  
  1.107     +2 -2      apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockets.c,v
  retrieving revision 1.106
  retrieving revision 1.107
  diff -u -r1.106 -r1.107
  --- sockets.c	1 Jan 2003 00:01:54 -0000	1.106
  +++ sockets.c	6 Jan 2003 23:44:35 -0000	1.107
  @@ -52,11 +52,11 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_network_io.h"
   #include "apr_support.h"
   #include "apr_portable.h"
  -#include "inherit.h"
  +#include "apr_arch_inherit.h"
   
   #if defined(BEOS) && !defined(BEOS_BONE)
   #define close closesocket
  
  
  
  1.65      +1 -1      apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- sockopt.c	1 Jan 2003 00:01:54 -0000	1.64
  +++ sockopt.c	6 Jan 2003 23:44:35 -0000	1.65
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_strings.h"
   
   static apr_status_t soblock(int sd)
  
  
  
  1.63      +2 -2      apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- sendrecv.c	1 Jan 2003 00:01:54 -0000	1.62
  +++ sendrecv.c	6 Jan 2003 23:44:35 -0000	1.63
  @@ -52,12 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_errno.h"
   #include "apr_general.h"
   #include "apr_network_io.h"
   #include "apr_lib.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #if APR_HAVE_TIME_H
   #include <time.h>
   #endif
  
  
  
  1.95      +3 -3      apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sockets.c,v
  retrieving revision 1.94
  retrieving revision 1.95
  diff -u -r1.94 -r1.95
  --- sockets.c	1 Jan 2003 00:01:54 -0000	1.94
  +++ sockets.c	6 Jan 2003 23:44:36 -0000	1.95
  @@ -52,14 +52,14 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_network_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
   #include "apr_portable.h"
   #include <string.h>
  -#include "inherit.h"
  -#include "misc.h"
  +#include "apr_arch_inherit.h"
  +#include "apr_arch_misc.h"
   
   static char generic_inaddr_any[16] = {0}; /* big enough for IPv4 or IPv6 */
   
  
  
  
  1.51      +1 -1      apr/network_io/win32/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apr/network_io/win32/sockopt.c,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- sockopt.c	1 Jan 2003 00:01:54 -0000	1.50
  +++ sockopt.c	6 Jan 2003 23:44:36 -0000	1.51
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_network_io.h"
   #include "apr_general.h"
   #include "apr_strings.h"
  
  
  
  1.5       +1 -1      apr/poll/os2/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apr/poll/os2/poll.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- poll.c	1 Jan 2003 00:01:54 -0000	1.4
  +++ poll.c	6 Jan 2003 23:44:36 -0000	1.5
  @@ -54,7 +54,7 @@
   
   #include "apr.h"
   #include "apr_poll.h"
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   
   APR_DECLARE(apr_status_t) apr_poll(apr_pollfd_t *aprset, apr_int32_t num,
                         apr_int32_t *nsds, apr_interval_time_t timeout)
  
  
  
  1.5       +1 -1      apr/poll/os2/pollset.c
  
  Index: pollset.c
  ===================================================================
  RCS file: /home/cvs/apr/poll/os2/pollset.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- pollset.c	4 Jan 2003 00:22:28 -0000	1.4
  +++ pollset.c	6 Jan 2003 23:44:36 -0000	1.5
  @@ -54,7 +54,7 @@
   
   #include "apr.h"
   #include "apr_poll.h"
  -#include "networkio.h"
  +#include "apr_arch_networkio.h"
   
   
   
  
  
  
  1.37      +2 -2      apr/poll/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apr/poll/unix/poll.c,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -r1.36 -r1.37
  --- poll.c	3 Jan 2003 17:47:07 -0000	1.36
  +++ poll.c	6 Jan 2003 23:44:36 -0000	1.37
  @@ -56,8 +56,8 @@
   #include "apr_poll.h"
   #include "apr_time.h"
   #include "apr_portable.h"
  -#include "networkio.h"
  -#include "fileio.h"
  +#include "apr_arch_networkio.h"
  +#include "apr_arch_fileio.h"
   #if HAVE_POLL_H
   #include <poll.h>
   #endif
  
  
  
  1.7       +2 -2      apr/poll/unix/pollacc.c
  
  Index: pollacc.c
  ===================================================================
  RCS file: /home/cvs/apr/poll/unix/pollacc.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- pollacc.c	1 Jan 2003 00:01:55 -0000	1.6
  +++ pollacc.c	6 Jan 2003 23:44:36 -0000	1.7
  @@ -54,8 +54,8 @@
   
   #include "apr.h"
   #include "apr_poll.h"
  -#include "networkio.h"
  -#include "fileio.h"
  +#include "apr_arch_networkio.h"
  +#include "apr_arch_fileio.h"
   #if HAVE_POLL_H
   #include <poll.h>
   #endif
  
  
  
  1.21      +1 -1      apr/shmem/unix/shm.c
  
  Index: shm.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/unix/shm.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- shm.c	1 Jan 2003 00:01:55 -0000	1.20
  +++ shm.c	6 Jan 2003 23:44:36 -0000	1.21
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "shm.h"
  +#include "apr_arch_shm.h"
   
   #include "apr_general.h"
   #include "apr_errno.h"
  
  
  
  1.14      +1 -1      apr/shmem/win32/shm.c
  
  Index: shm.c
  ===================================================================
  RCS file: /home/cvs/apr/shmem/win32/shm.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- shm.c	1 Jan 2003 00:01:55 -0000	1.13
  +++ shm.c	6 Jan 2003 23:44:36 -0000	1.14
  @@ -56,7 +56,7 @@
   #include "apr_errno.h"
   #include "apr_file_io.h"
   #include "apr_shm.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   typedef struct memblock_t {
       apr_size_t size;
  
  
  
  1.5       +2 -2      apr/support/unix/waitio.c
  
  Index: waitio.c
  ===================================================================
  RCS file: /home/cvs/apr/support/unix/waitio.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- waitio.c	1 Jan 2003 00:01:55 -0000	1.4
  +++ waitio.c	6 Jan 2003 23:44:37 -0000	1.5
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "fileio.h"
  -#include "networkio.h"
  +#include "apr_arch_fileio.h"
  +#include "apr_arch_networkio.h"
   #include "apr_poll.h"
   #include "apr_errno.h"
   #include "apr_support.h"
  
  
  
  1.3       +1 -1      apr/test/internal/testucs.c
  
  Index: testucs.c
  ===================================================================
  RCS file: /home/cvs/apr/test/internal/testucs.c,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- testucs.c	1 Jan 2003 00:01:58 -0000	1.2
  +++ testucs.c	6 Jan 2003 23:44:37 -0000	1.3
  @@ -53,7 +53,7 @@
    */
   
   #include "apr.h"
  -#include "arch/win32/utf8.h"
  +#include "arch/win32/apr_arch_utf8.h"
   #include <wchar.h>
   #include <string.h>
   
  
  
  
  1.48      +1 -1      apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/beos/proc.c,v
  retrieving revision 1.47
  retrieving revision 1.48
  diff -u -r1.47 -r1.48
  --- proc.c	1 Jan 2003 00:01:58 -0000	1.47
  +++ proc.c	6 Jan 2003 23:44:37 -0000	1.48
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   #include "apr_strings.h"
   
   struct send_pipe {
  
  
  
  1.35      +1 -1      apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/beos/thread.c,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- thread.c	1 Jan 2003 00:01:58 -0000	1.34
  +++ thread.c	6 Jan 2003 23:44:37 -0000	1.35
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   #include "apr_portable.h"
   
   APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool)
  
  
  
  1.22      +1 -1      apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- threadpriv.c	1 Jan 2003 00:01:58 -0000	1.21
  +++ threadpriv.c	6 Jan 2003 23:44:37 -0000	1.22
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   
   static struct beos_key key_table[BEOS_MAX_DATAKEYS];
   static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
  
  
  
  1.18      +2 -2      apr/threadproc/netware/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/netware/proc.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- proc.c	1 Jan 2003 00:01:59 -0000	1.17
  +++ proc.c	6 Jan 2003 23:44:37 -0000	1.18
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  -#include "fileio.h"
  +#include "apr_arch_threadproc.h"
  +#include "apr_arch_fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.5       +1 -1      apr/threadproc/netware/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/netware/procsup.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- procsup.c	1 Jan 2003 00:01:59 -0000	1.4
  +++ procsup.c	6 Jan 2003 23:44:38 -0000	1.5
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   
   apr_status_t apr_proc_detach(int daemonize)
   {
  
  
  
  1.8       +1 -1      apr/threadproc/netware/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/netware/signals.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- signals.c	1 Jan 2003 00:01:59 -0000	1.7
  +++ signals.c	6 Jan 2003 23:44:38 -0000	1.8
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   #include <nks/thread.h>
   #include "apr_private.h"
   #include "apr_pools.h"
  
  
  
  1.14      +1 -1      apr/threadproc/netware/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/netware/thread.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- thread.c	1 Jan 2003 00:01:59 -0000	1.13
  +++ thread.c	6 Jan 2003 23:44:38 -0000	1.14
  @@ -55,7 +55,7 @@
   #include "apr.h"
   #include "apr_portable.h"
   #include "apr_strings.h"
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   
   static int thread_count = 0;
   
  
  
  
  1.5       +1 -1      apr/threadproc/netware/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/netware/threadpriv.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadpriv.c	1 Jan 2003 00:01:59 -0000	1.4
  +++ threadpriv.c	6 Jan 2003 23:44:38 -0000	1.5
  @@ -53,7 +53,7 @@
    */
   
   #include "apr_portable.h"
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   
   apr_status_t apr_threadkey_private_create(apr_threadkey_t **key, 
                                           void (*dest)(void *), apr_pool_t *pool) 
  
  
  
  1.54      +2 -2      apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/os2/proc.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- proc.c	1 Jan 2003 00:01:59 -0000	1.53
  +++ proc.c	6 Jan 2003 23:44:38 -0000	1.54
  @@ -55,8 +55,8 @@
   #define INCL_DOS
   #define INCL_DOSERRORS
   
  -#include "threadproc.h"
  -#include "fileio.h"
  +#include "apr_arch_threadproc.h"
  +#include "apr_arch_fileio.h"
   #include "apr_private.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
  
  
  
  1.36      +2 -2      apr/threadproc/os2/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/os2/thread.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- thread.c	1 Jan 2003 00:01:59 -0000	1.35
  +++ thread.c	6 Jan 2003 23:44:38 -0000	1.36
  @@ -54,12 +54,12 @@
   
   #define INCL_DOSERRORS
   #define INCL_DOS
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_lib.h"
   #include "apr_portable.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #include <stdlib.h>
   
   APR_DECLARE(apr_status_t) apr_threadattr_create(apr_threadattr_t **new, apr_pool_t *pool)
  
  
  
  1.20      +2 -2      apr/threadproc/os2/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/os2/threadpriv.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- threadpriv.c	1 Jan 2003 00:01:59 -0000	1.19
  +++ threadpriv.c	6 Jan 2003 23:44:38 -0000	1.20
  @@ -52,13 +52,13 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_portable.h"
   #include "apr_general.h"
   #include "apr_errno.h"
   #include "apr_lib.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   
   APR_DECLARE(apr_status_t) apr_threadkey_private_create(apr_threadkey_t **key,
                                                          void (*dest)(void *), 
  
  
  
  1.62      +1 -1      apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/proc.c,v
  retrieving revision 1.61
  retrieving revision 1.62
  diff -u -r1.61 -r1.62
  --- proc.c	1 Jan 2003 00:01:59 -0000	1.61
  +++ proc.c	6 Jan 2003 23:44:38 -0000	1.62
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   #include "apr_signal.h"
  
  
  
  1.38      +1 -1      apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- procsup.c	1 Jan 2003 00:01:59 -0000	1.37
  +++ procsup.c	6 Jan 2003 23:44:38 -0000	1.38
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   
   APR_DECLARE(apr_status_t) apr_proc_detach(int daemonize)
   {
  
  
  
  1.53      +1 -1      apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/signals.c,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- signals.c	1 Jan 2003 00:01:59 -0000	1.52
  +++ signals.c	6 Jan 2003 23:44:38 -0000	1.53
  @@ -53,7 +53,7 @@
    */
   
   #define INCL_DOSEXCEPTIONS      /* for OS2 */
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   #include "apr_private.h"
   #include "apr_pools.h"
   #include "apr_signal.h"
  
  
  
  1.54      +1 -1      apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/thread.c,v
  retrieving revision 1.53
  retrieving revision 1.54
  diff -u -r1.53 -r1.54
  --- thread.c	1 Jan 2003 00:01:59 -0000	1.53
  +++ thread.c	6 Jan 2003 23:44:38 -0000	1.54
  @@ -54,7 +54,7 @@
   
   #include "apr.h"
   #include "apr_portable.h"
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   
   #if APR_HAS_THREADS
   
  
  
  
  1.38      +1 -1      apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- threadpriv.c	1 Jan 2003 00:01:59 -0000	1.37
  +++ threadpriv.c	6 Jan 2003 23:44:38 -0000	1.38
  @@ -54,7 +54,7 @@
   
   #include "apr.h"
   #include "apr_portable.h"
  -#include "threadproc.h"
  +#include "apr_arch_threadproc.h"
   
   #if APR_HAS_THREADS
   
  
  
  
  1.84      +2 -2      apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/proc.c,v
  retrieving revision 1.83
  retrieving revision 1.84
  diff -u -r1.83 -r1.84
  --- proc.c	1 Jan 2003 00:02:00 -0000	1.83
  +++ proc.c	6 Jan 2003 23:44:39 -0000	1.84
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/threadproc.h"
  -#include "win32/fileio.h"
  +#include "win32/apr_arch_threadproc.h"
  +#include "win32/apr_arch_fileio.h"
   
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
  
  
  
  1.22      +2 -2      apr/threadproc/win32/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/signals.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- signals.c	1 Jan 2003 00:02:00 -0000	1.21
  +++ signals.c	6 Jan 2003 23:44:39 -0000	1.22
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/threadproc.h"
  -#include "win32/fileio.h"
  +#include "win32/apr_arch_threadproc.h"
  +#include "win32/apr_arch_fileio.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.52      +2 -2      apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/thread.c,v
  retrieving revision 1.51
  retrieving revision 1.52
  diff -u -r1.51 -r1.52
  --- thread.c	1 Jan 2003 00:02:00 -0000	1.51
  +++ thread.c	6 Jan 2003 23:44:39 -0000	1.52
  @@ -53,7 +53,7 @@
    */
   
   #include "apr_private.h"
  -#include "win32/threadproc.h"
  +#include "win32/apr_arch_threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  @@ -61,7 +61,7 @@
   #if APR_HAVE_PROCESS_H
   #include <process.h>
   #endif
  -#include "misc.h"   
  +#include "apr_arch_misc.h"   
   
   /* Chosen for us by apr_initialize */
   DWORD tls_apr_thread = 0;
  
  
  
  1.29      +1 -1      apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- threadpriv.c	1 Jan 2003 00:02:00 -0000	1.28
  +++ threadpriv.c	6 Jan 2003 23:44:39 -0000	1.29
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/threadproc.h"
  +#include "win32/apr_arch_threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.73      +1 -1      apr/time/unix/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apr/time/unix/time.c,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- time.c	1 Jan 2003 00:02:00 -0000	1.72
  +++ time.c	6 Jan 2003 23:44:40 -0000	1.73
  @@ -59,7 +59,7 @@
   #include "apr_strings.h"
   
   /* private APR headers */
  -#include "internal_time.h"
  +#include "apr_arch_internal_time.h"
   
   /* System Headers required for time library */
   #if APR_HAVE_SYS_TIME_H
  
  
  
  1.16      +1 -1      apr/time/win32/access.c
  
  Index: access.c
  ===================================================================
  RCS file: /home/cvs/apr/time/win32/access.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- access.c	1 Jan 2003 00:02:00 -0000	1.15
  +++ access.c	6 Jan 2003 23:44:40 -0000	1.16
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/atime.h"
  +#include "win32/apr_arch_atime.h"
   #include "apr_time.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.40      +2 -2      apr/time/win32/time.c
  
  Index: time.c
  ===================================================================
  RCS file: /home/cvs/apr/time/win32/time.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- time.c	1 Jan 2003 00:02:00 -0000	1.39
  +++ time.c	6 Jan 2003 23:44:40 -0000	1.40
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/atime.h"
  +#include "win32/apr_arch_atime.h"
   #include "apr_time.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  @@ -65,7 +65,7 @@
   #endif
   #include <string.h>
   #include <winbase.h>
  -#include "misc.h"
  +#include "apr_arch_misc.h"
   
   /* Leap year is any year divisible by four, but not by 100 unless also
    * divisible by 400
  
  
  
  1.22      +1 -1      apr/time/win32/timestr.c
  
  Index: timestr.c
  ===================================================================
  RCS file: /home/cvs/apr/time/win32/timestr.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- timestr.c	1 Jan 2003 00:02:00 -0000	1.21
  +++ timestr.c	6 Jan 2003 23:44:40 -0000	1.22
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "win32/atime.h"
  +#include "win32/apr_arch_atime.h"
   #include "apr_portable.h"
   #include "apr_strings.h"
   
  
  
  
  1.22      +1 -1      apr/user/win32/userinfo.c
  
  Index: userinfo.c
  ===================================================================
  RCS file: /home/cvs/apr/user/win32/userinfo.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- userinfo.c	1 Jan 2003 00:02:01 -0000	1.21
  +++ userinfo.c	6 Jan 2003 23:44:40 -0000	1.22
  @@ -56,7 +56,7 @@
   #include "apr_strings.h"
   #include "apr_portable.h"
   #include "apr_user.h"
  -#include "fileio.h"
  +#include "apr_arch_fileio.h"
   #if APR_HAVE_SYS_TYPES_H
   #include <sys/types.h>
   #endif
  
  
  

Mime
View raw message