httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/os2 Makefile.in proc.c signals.c thread.c threadpriv.c
Date Tue, 14 Nov 2000 06:40:08 GMT
bjh         00/11/13 22:40:07

  Modified:    src/lib/apr/dso/os2 Makefile.in dso.c
               src/lib/apr/file_io/os2 Makefile.in dir.c filedup.c
                        filestat.c maperrorcode.c open.c pipe.c readwrite.c
                        seek.c
               src/lib/apr/file_io/unix Makefile.in dir.c fileacc.c
                        filedup.c filestat.c open.c pipe.c readwrite.c
                        seek.c
               src/lib/apr/include/arch/os2 networkio.h
               src/lib/apr/locks/os2 Makefile.in locks.c
               src/lib/apr/misc/unix Makefile.in
               src/lib/apr/network_io/os2 Makefile.in
               src/lib/apr/network_io/unix Makefile.in poll.c sendrecv.c
               src/lib/apr/shmem/os2 Makefile.in
               src/lib/apr/threadproc/os2 Makefile.in proc.c signals.c
                        thread.c threadpriv.c
  Removed:     src/lib/apr/network_io/unix networkio.h
  Log:
  Fix OS/2 build after the move of private APR headers to the include/arch/
  area. This also messes with some unix stuff where it's shared with OS/2.
  The strategy used to get the right platform specific include files is:
  
  - Every Makefile.in contains something like
  OSDIR=$(INCDIR)/arch/@OSDIR@
  DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
  
  - all APR private includes look like #include "fileio.h", ie no leading
  arch directory so no #ifdef'ing needed in shared .c files.
  
  This ensures that the include file for the target platform is always used
  if it exists, otherwise the default is used.
  
  Revision  Changes    Path
  1.8       +10 -7     apache-2.0/src/lib/apr/dso/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/Makefile.in,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- Makefile.in	2000/11/09 06:08:35	1.7
  +++ Makefile.in	2000/11/14 06:40:02	1.8
  @@ -10,7 +10,9 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   LIB=libdso.a
   
  @@ -42,15 +44,16 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c | sed -e "s%\\\\\(.\)%/\\1%g" >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -dso.o: dso.c dso.h $(INCDIR)/apr_private.h \
  +dso.o: dso.c $(OSDIR)/dso.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_file_io.h \
  - $(INCDIR)/apr_time.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_dso.h
  
  
  
  1.14      +1 -1      apache-2.0/src/lib/apr/dso/os2/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- dso.c	2000/11/09 06:08:35	1.13
  +++ dso.c	2000/11/14 06:40:02	1.14
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "os2/dso.h"
  +#include "dso.h"
   #define INCL_DOS
   #include <os2.h>
   #include <stdio.h>
  
  
  
  1.14      +73 -49    apache-2.0/src/lib/apr/file_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/Makefile.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Makefile.in	2000/11/09 06:15:49	1.13
  +++ Makefile.in	2000/11/14 06:40:02	1.14
  @@ -9,7 +9,9 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   LIB=file.a
   
  @@ -49,55 +51,77 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c | sed -e "s%\\\\\(.\)%/\\1%g" >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(INCDIR1)/: $$(INCDIR1)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -dir.o: dir.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -fileacc.o: fileacc.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -filedup.o: filedup.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -filestat.o: filestat.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -maperrorcode.o: maperrorcode.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h ../../network_io/os2/os2calls.h
  -open.o: open.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h $(INCDIR1)/apr_portable.h \
  - $(INCDIR1)/apr_network_io.h $(INCDIR1)/apr_lock.h
  -pipe.o: pipe.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -readwrite.o: readwrite.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -seek.o: seek.c fileio.h $(INCDIR1)/apr_private.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  +common.o: common.c ../unix/fileacc.c $(INCDIR)/apr_strings.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_tables.h $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h
  +dir.o: dir.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_strings.h
  +filedup.o: filedup.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_strings.h
  +filestat.o: filestat.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h
  +maperrorcode.o: maperrorcode.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + ../../network_io/os2/os2calls.h ../../network_io/os2/os2nerrno.h
  +open.o: open.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_dso.h $(INCDIR)/apr_strings.h
  +pipe.o: pipe.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_strings.h
  +readwrite.o: readwrite.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h
  +seek.o: seek.c $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h
  
  
  
  1.19      +1 -1      apache-2.0/src/lib/apr/file_io/os2/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/dir.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- dir.c	2000/11/13 04:04:57	1.18
  +++ dir.c	2000/11/14 06:40:02	1.19
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_strings.h"
  
  
  
  1.18      +1 -1      apache-2.0/src/lib/apr/file_io/os2/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filedup.c,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- filedup.c	2000/11/09 06:15:49	1.17
  +++ filedup.c	2000/11/14 06:40:03	1.18
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_strings.h"
  
  
  
  1.15      +1 -1      apache-2.0/src/lib/apr/file_io/os2/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/filestat.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- filestat.c	2000/11/09 06:15:49	1.14
  +++ filestat.c	2000/11/14 06:40:03	1.15
  @@ -54,7 +54,7 @@
   
   #define INCL_DOS
   #define INCL_DOSERRORS
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include <sys/time.h>
  
  
  
  1.11      +1 -1      apache-2.0/src/lib/apr/file_io/os2/maperrorcode.c
  
  Index: maperrorcode.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/maperrorcode.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- maperrorcode.c	2000/11/09 06:15:49	1.10
  +++ maperrorcode.c	2000/11/14 06:40:03	1.11
  @@ -53,7 +53,7 @@
    */
   
   #define INCL_DOSERRORS
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include <errno.h>
   #include <string.h>
  
  
  
  1.34      +1 -1      apache-2.0/src/lib/apr/file_io/os2/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/open.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- open.c	2000/11/09 06:15:49	1.33
  +++ open.c	2000/11/14 06:40:03	1.34
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include "apr_portable.h"
  
  
  
  1.29      +1 -1      apache-2.0/src/lib/apr/file_io/os2/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/pipe.c,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- pipe.c	2000/11/09 06:15:49	1.28
  +++ pipe.c	2000/11/14 06:40:03	1.29
  @@ -53,7 +53,7 @@
    */
   
   #define INCL_DOSERRORS
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.36      +1 -1      apache-2.0/src/lib/apr/file_io/os2/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/readwrite.c,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- readwrite.c	2000/11/13 07:47:44	1.35
  +++ readwrite.c	2000/11/14 06:40:03	1.36
  @@ -55,7 +55,7 @@
   #define INCL_DOS
   #define INCL_DOSERRORS
   
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   
  
  
  
  1.11      +1 -1      apache-2.0/src/lib/apr/file_io/os2/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/seek.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- seek.c	2000/11/09 06:15:49	1.10
  +++ seek.c	2000/11/14 06:40:03	1.11
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "os2/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_lib.h"
   #include <string.h>
  
  
  
  1.18      +3 -1      apache-2.0/src/lib/apr/file_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/Makefile.in,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Makefile.in	2000/11/09 21:12:48	1.17
  +++ Makefile.in	2000/11/14 06:40:03	1.18
  @@ -10,7 +10,9 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   #LIB=libfile.a
   
  
  
  
  1.40      +1 -1      apache-2.0/src/lib/apr/file_io/unix/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/dir.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- dir.c	2000/11/09 06:15:53	1.39
  +++ dir.c	2000/11/14 06:40:03	1.40
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "unix/fileio.h"
  +#include "fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.41      +1 -15     apache-2.0/src/lib/apr/file_io/unix/fileacc.c
  
  Index: fileacc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileacc.c,v
  retrieving revision 1.40
  retrieving revision 1.41
  diff -u -r1.40 -r1.41
  --- fileacc.c	2000/11/09 14:06:42	1.40
  +++ fileacc.c	2000/11/14 06:40:03	1.41
  @@ -53,21 +53,7 @@
    */
   
   #include "apr_strings.h"
  -#ifdef OS2
  -#include "os2/fileio.h"
  -#elif defined(WIN32)
  -#include "win32/fileio.h"
  -#endif
  -#if defined(OS2) || defined(WIN32)
  -#include "apr_file_io.h"
  -#include "apr_general.h"
  -#include "apr_lib.h"
  -#include <errno.h>
  -#include <string.h>
  -#include <sys/types.h>
  -#else
  -#include "unix/fileio.h"
  -#endif
  +#include "fileio.h"
   
   /* A file to put ALL of the accessor functions for apr_file_t types. */
   
  
  
  
  1.27      +1 -1      apache-2.0/src/lib/apr/file_io/unix/filedup.c
  
  Index: filedup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filedup.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- filedup.c	2000/11/09 06:15:53	1.26
  +++ filedup.c	2000/11/14 06:40:03	1.27
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "unix/fileio.h"
  +#include "fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.33      +1 -1      apache-2.0/src/lib/apr/file_io/unix/filestat.c
  
  Index: filestat.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/filestat.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- filestat.c	2000/11/10 15:19:53	1.32
  +++ filestat.c	2000/11/14 06:40:03	1.33
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "unix/fileio.h"
  +#include "fileio.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
   #include "apr_errno.h"
  
  
  
  1.67      +1 -1      apache-2.0/src/lib/apr/file_io/unix/open.c
  
  Index: open.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/open.c,v
  retrieving revision 1.66
  retrieving revision 1.67
  diff -u -r1.66 -r1.67
  --- open.c	2000/11/09 06:15:53	1.66
  +++ open.c	2000/11/14 06:40:03	1.67
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "unix/fileio.h"
  +#include "fileio.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.44      +1 -1      apache-2.0/src/lib/apr/file_io/unix/pipe.c
  
  Index: pipe.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/pipe.c,v
  retrieving revision 1.43
  retrieving revision 1.44
  diff -u -r1.43 -r1.44
  --- pipe.c	2000/11/09 06:15:53	1.43
  +++ pipe.c	2000/11/14 06:40:03	1.44
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "unix/fileio.h"
  +#include "fileio.h"
   #include "apr_strings.h"
   
   static apr_status_t pipeblock(apr_file_t *thepipe)
  
  
  
  1.63      +1 -1      apache-2.0/src/lib/apr/file_io/unix/readwrite.c
  
  Index: readwrite.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/readwrite.c,v
  retrieving revision 1.62
  retrieving revision 1.63
  diff -u -r1.62 -r1.63
  --- readwrite.c	2000/11/09 06:15:53	1.62
  +++ readwrite.c	2000/11/14 06:40:03	1.63
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "unix/fileio.h"
  +#include "fileio.h"
   #include "apr_lock.h"
   
   /* The only case where we don't use wait_for_io_or_timeout is on
  
  
  
  1.17      +1 -1      apache-2.0/src/lib/apr/file_io/unix/seek.c
  
  Index: seek.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/seek.c,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- seek.c	2000/11/09 06:15:53	1.16
  +++ seek.c	2000/11/14 06:40:03	1.17
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "unix/fileio.h"
  +#include "fileio.h"
   
   static apr_status_t setptr(apr_file_t *thefile, unsigned long pos )
   {
  
  
  
  1.14      +6 -0      apache-2.0/src/lib/apr/include/arch/os2/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/arch/os2/networkio.h,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- networkio.h	2000/08/02 05:26:27	1.13
  +++ networkio.h	2000/11/14 06:40:04	1.14
  @@ -55,9 +55,13 @@
   #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 HAVE_NETDB_H
  +#include <netdb.h>
  +#endif
   
   struct apr_socket_t {
       apr_pool_t *cntxt;
  @@ -67,6 +71,8 @@
       int addr_len;
       apr_interval_time_t timeout;
       int nonblock;
  +    int local_port_unknown;
  +    int local_interface_unknown;
   };
   
   struct apr_pollfd_t {
  
  
  
  1.10      +14 -10    apache-2.0/src/lib/apr/locks/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/Makefile.in,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.in	2000/11/09 06:25:28	1.9
  +++ Makefile.in	2000/11/14 06:40:06	1.10
  @@ -9,7 +9,9 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   LIB=lock.a
   
  @@ -41,16 +43,18 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c | sed -e "s%\\\\\(.\)%/\\1%g" >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -                   -e '1,$$s: $(INCDIR1)/: $$(INCDIR1)/:g' \
  -                   -e '1,$$s: $(INCDIR2)/: $$(INCDIR2)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -locks.o: locks.c $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_time.h \
  - $(INCDIR1)/apr_thread_proc.h locks.h $(INCDIR1)/apr_lock.h \
  - $(INCDIR2)/fileio.h $(INCDIR1)/apr_private.h
  +locks.o: locks.c $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_strings.h $(OSDIR)/locks.h \
  + $(INCDIR)/apr_lock.h $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h
  
  
  
  1.21      +2 -2      apache-2.0/src/lib/apr/locks/os2/locks.c
  
  Index: locks.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- locks.c	2000/11/09 06:25:28	1.20
  +++ locks.c	2000/11/14 06:40:06	1.21
  @@ -55,8 +55,8 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   #include "apr_strings.h"
  -#include "os2/locks.h"
  -#include "os2/fileio.h"
  +#include "locks.h"
  +#include "fileio.h"
   #include <string.h>
   #define INCL_DOS
   #include <os2.h>
  
  
  
  1.25      +17 -15    apache-2.0/src/lib/apr/misc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/Makefile.in,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- Makefile.in	2000/11/09 06:30:11	1.24
  +++ Makefile.in	2000/11/14 06:40:06	1.25
  @@ -10,7 +10,9 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch/@OSDIR@
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   #LIB=libmisc.a
   
  @@ -43,19 +45,20 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -canonerr.o: canonerr.c $(INCDIR)/arch/unix/misc.h \
  +canonerr.o: canonerr.c $(DEFOSDIR)/misc.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_getopt.h
  -errorcodes.o: errorcodes.c $(INCDIR)/arch/unix/misc.h \
  +errorcodes.o: errorcodes.c $(DEFOSDIR)/misc.h \
    $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  @@ -63,7 +66,7 @@
    $(INCDIR)/apr_getopt.h $(INCDIR)/apr_strings.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_tables.h \
    $(INCDIR)/apr_dso.h
  -getopt.o: getopt.c $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr.h \
  +getopt.o: getopt.c $(DEFOSDIR)/misc.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  @@ -76,26 +79,25 @@
    $(INCDIR)/apr_time.h $(INCDIR)/apr_tables.h \
    $(INCDIR)/apr_xlate.h
   otherchild.o: otherchild.c $(INCDIR)/apr.h \
  - $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr_private.h \
  + $(DEFOSDIR)/misc.h $(INCDIR)/apr_private.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  - $(INCDIR)/apr_getopt.h $(INCDIR)/arch/unix/threadproc.h \
  - $(INCDIR)/arch/unix/fileio.h $(INCDIR)/apr_tables.h \
  - $(INCDIR)/apr_lib.h
  -rand.o: rand.c $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_getopt.h $(OSDIR)/threadproc.h \
  + $(OSDIR)/fileio.h $(INCDIR)/apr_lock.h
  +rand.o: rand.c $(DEFOSDIR)/misc.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_getopt.h
  -start.o: start.c $(INCDIR)/arch/unix/misc.h $(INCDIR)/apr.h \
  +start.o: start.c $(DEFOSDIR)/misc.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_getopt.h \
  - $(INCDIR)/arch/unix/locks.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_tables.h $(INCDIR)/apr_lock.h \
  - $(INCDIR)/apr_strings.h
  + $(OSDIR)/locks.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_tables.h
   uuid.o: uuid.c $(INCDIR)/apr.h $(INCDIR)/apr_uuid.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_lib.h \
    $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  
  
  
  1.11      +64 -40    apache-2.0/src/lib/apr/network_io/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2000/04/30 17:58:30	1.10
  +++ Makefile.in	2000/11/14 06:40:06	1.11
  @@ -8,9 +8,10 @@
   CFLAGS=@CFLAGS@ @OPTIM@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
  -INCDIR=../../inc
  -INCDIR1=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I.
  +INCDIR=../../include
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   LIB=network.a
   
  @@ -47,44 +48,67 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c | sed -e "s%\\\\\(.\)%/\\1%g" >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -                   -e '1,$$s: $(INCDIR1)/: $$(INCDIR1)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -os2calls.o: os2calls.c networkio.h $(INCDIR1)/apr_network_io.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h os2calls.h $(INCDIR1)/apr_portable.h \
  - $(INCDIR1)/apr_thread_proc.h $(INCDIR1)/apr_lock.h \
  - $(INCDIR1)/apr_lib.h
  -poll.o: poll.c networkio.h $(INCDIR1)/apr_network_io.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h os2calls.h $(INCDIR1)/apr_portable.h \
  - $(INCDIR1)/apr_thread_proc.h $(INCDIR1)/apr_lock.h \
  - $(INCDIR1)/apr_lib.h
  -sendrecv.o: sendrecv.c networkio.h $(INCDIR1)/apr_network_io.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h os2calls.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -sockaddr.o: sockaddr.c ../unix/sockaddr.c ../unix/networkio.h \
  - $(INCDIR1)/apr_private.h $(INCDIR1)/apr_network_io.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  -sockets.o: sockets.c networkio.h $(INCDIR1)/apr_network_io.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h os2calls.h $(INCDIR1)/apr_portable.h \
  - $(INCDIR1)/apr_thread_proc.h $(INCDIR1)/apr_lock.h \
  - $(INCDIR1)/apr_lib.h
  -sockopt.o: sockopt.c networkio.h $(INCDIR1)/apr_network_io.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h os2calls.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_thread_proc.h
  +os2calls.o: os2calls.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
  + $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_tables.h
  +poll.o: poll.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
  + $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_tables.h
  +sendrecv.o: sendrecv.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h
  +sockaddr.o: sockaddr.c ../unix/sockaddr.c \
  + $(OSDIR)/networkio.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
  + $(INCDIR)/apr_strings.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_tables.h ../unix/sa_common.c
  +sockets.o: sockets.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
  + $(INCDIR)/apr_portable.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_tables.h os2calls.h os2nerrno.h
  +sockopt.o: sockopt.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(OSDIR)/os2calls.h $(OSDIR)/os2nerrno.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_strings.h
  
  
  
  1.19      +38 -34    apache-2.0/src/lib/apr/network_io/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/Makefile.in,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- Makefile.in	2000/11/09 07:13:42	1.18
  +++ Makefile.in	2000/11/14 06:40:06	1.19
  @@ -10,7 +10,9 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   LIB=libnetwork.a
   
  @@ -46,46 +48,48 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
   inet_aton.o: inet_aton.c $(INCDIR)/apr_private.h
  -poll.o: poll.c networkio.h $(INCDIR)/apr.h \
  +poll.o: poll.c $(OSDIR)/networkio.h $(INCDIR)/apr.h \
    $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  - $(INCDIR)/arch/unix/fileio.h
  -sendrecv.o: sendrecv.c networkio.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  - $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  - $(INCDIR)/arch/unix/fileio.h
  -sockaddr.o: sockaddr.c networkio.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  - $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  - $(INCDIR)/apr_strings.h
  -sockets.o: sockets.c networkio.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  - $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  - $(INCDIR)/apr_portable.h $(INCDIR)/apr_lock.h \
  - $(INCDIR)/apr_dso.h
  -sockopt.o: sockopt.c networkio.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  - $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_tables.h \
  - $(INCDIR)/apr_strings.h
  + $(OSDIR)/fileio.h
  +sa_common.o: sa_common.c $(INCDIR)/apr.h
  +sendrecv.o: sendrecv.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_tables.h
  +sockaddr.o: sockaddr.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h sa_common.c
  +sockets.o: sockets.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_portable.h \
  + $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
  +sockopt.o: sockopt.c $(OSDIR)/networkio.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_general.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h
  
  
  
  1.40      +1 -1      apache-2.0/src/lib/apr/network_io/unix/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/poll.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- poll.c	2000/11/09 07:13:42	1.39
  +++ poll.c	2000/11/14 06:40:06	1.40
  @@ -53,7 +53,7 @@
    */
   
   #include "networkio.h"
  -#include "unix/fileio.h"
  +#include "fileio.h"
   
   #ifdef HAVE_POLL    /* We can just use poll to do our socket polling. */
   
  
  
  
  1.49      +1 -1      apache-2.0/src/lib/apr/network_io/unix/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sendrecv.c,v
  retrieving revision 1.48
  retrieving revision 1.49
  diff -u -r1.48 -r1.49
  --- sendrecv.c	2000/11/13 14:39:19	1.48
  +++ sendrecv.c	2000/11/14 06:40:06	1.49
  @@ -56,7 +56,7 @@
   
   #if APR_HAS_SENDFILE
   /* This file is needed to allow us access to the apr_file_t internals. */
  -#include "unix/fileio.h"
  +#include "fileio.h"
   
   /* Glibc2.1.1 fails to define TCP_CORK.  This is a bug that will be 
    *fixed in the next release.  It should be 3
  
  
  
  1.5       +12 -9     apache-2.0/src/lib/apr/shmem/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/shmem/os2/Makefile.in,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- Makefile.in	2000/11/09 06:36:04	1.4
  +++ Makefile.in	2000/11/14 06:40:06	1.5
  @@ -9,7 +9,9 @@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
   INCDIR=../../include
  -INCLUDES=-I$(INCDIR)
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   LIB=shmem.a
   
  @@ -41,15 +43,16 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c | sed -e "s%\\\\\(.\)%/\\1%g" >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -                   -e '1,$$s: $(INCDIR1)/: $$(INCDIR1)/:g' \
  -                   -e '1,$$s: $(INCDIR2)/: $$(INCDIR2)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -shmem.o: shmem.c $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_shmem.h \
  - $(INCDIR1)/apr_lib.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_thread_proc.h
  +shmem.o: shmem.c $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_shmem.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_thread_proc.h \
  + $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_strings.h
  
  
  
  1.11      +45 -29    apache-2.0/src/lib/apr/threadproc/os2/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/Makefile.in,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Makefile.in	2000/11/09 06:47:52	1.10
  +++ Makefile.in	2000/11/14 06:40:07	1.11
  @@ -8,8 +8,10 @@
   CFLAGS=@CFLAGS@ @OPTIM@
   LIBS=@LIBS@
   LDFLAGS=@LDFLAGS@ $(LIBS)
  -INCDIR1=../../include
  -INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
  +INCDIR=../../include
  +OSDIR=$(INCDIR)/arch/@OSDIR@
  +DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
  +INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR)
   
   LIB=threadproc.a
   
  @@ -44,34 +46,48 @@
   	cp Makefile.in Makefile.in.bak \
   	    && sed -ne '1,/^# DO NOT REMOVE/p' Makefile.in > Makefile.new \
   	    && gcc -MM $(INCLUDES) $(CFLAGS) *.c | sed -e "s%\\\\\(.\)%/\\1%g" >> Makefile.new \
  -	    && sed -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' \
  -                   -e '1,$$s: $(INCDIR1)/: $$(INCDIR1)/:g' \
  -                   -e '1,$$s: $(INCDIR2)/: $$(INCDIR2)/:g' \
  -	           -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' Makefile.new \
  +	    && sed -e '1,$$s: $(OSDIR)/: $$(OSDIR)/:g' \
  +                   -e '1,$$s: $(DEFOSDIR)/: $$(DEFOSDIR)/:g' \
  +	           -e '1,$$s: $(INCDIR)/: $$(INCDIR)/:g' Makefile.new \
   		> Makefile.in \
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -proc.o: proc.c threadproc.h $(INCDIR1)/apr_thread_proc.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_general.h \
  - $(INCDIR1)/apr.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_time.h $(INCDIR2)/fileio.h \
  - $(INCDIR1)/apr_private.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR1)/apr_portable.h $(INCDIR1)/apr_network_io.h \
  - $(INCDIR1)/apr_lock.h
  -signals.o: signals.c threadproc.h $(INCDIR1)/apr_thread_proc.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_general.h \
  - $(INCDIR1)/apr.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_time.h $(INCDIR2)/fileio.h \
  - $(INCDIR1)/apr_private.h
  -thread.o: thread.c threadproc.h $(INCDIR1)/apr_thread_proc.h \
  - $(INCDIR1)/apr_file_io.h $(INCDIR1)/apr_general.h \
  - $(INCDIR1)/apr.h $(INCDIR1)/apr_errno.h \
  - $(INCDIR1)/apr_time.h $(INCDIR1)/apr_lib.h \
  - $(INCDIR2)/fileio.h $(INCDIR1)/apr_private.h
  -threadpriv.o: threadpriv.c threadproc.h \
  - $(INCDIR1)/apr_thread_proc.h $(INCDIR1)/apr_file_io.h \
  - $(INCDIR1)/apr_general.h $(INCDIR1)/apr.h \
  - $(INCDIR1)/apr_errno.h $(INCDIR1)/apr_time.h \
  - $(INCDIR1)/apr_lib.h $(INCDIR2)/fileio.h \
  - $(INCDIR1)/apr_private.h
  +proc.o: proc.c $(OSDIR)/threadproc.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_time.h $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_portable.h \
  + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_dso.h \
  + $(INCDIR)/apr_strings.h
  +signals.o: signals.c $(OSDIR)/threadproc.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_time.h $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h
  +thread.o: thread.c $(OSDIR)/threadproc.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h \
  + $(OSDIR)/fileio.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_lock.h
  +threadcancel.o: threadcancel.c $(OSDIR)/threadproc.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_time.h $(OSDIR)/fileio.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h
  +threadpriv.o: threadpriv.c $(OSDIR)/threadproc.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr.h \
  + $(INCDIR)/apr_errno.h $(INCDIR)/../network_io/os2/os2nerrno.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h \
  + $(OSDIR)/fileio.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_lock.h
  
  
  
  1.33      +2 -2      apache-2.0/src/lib/apr/threadproc/os2/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/proc.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- proc.c	2000/11/09 06:47:52	1.32
  +++ proc.c	2000/11/14 06:40:07	1.33
  @@ -55,8 +55,8 @@
   #define INCL_DOS
   #define INCL_DOSERRORS
   
  -#include "os2/threadproc.h"
  -#include "os2/fileio.h"
  +#include "threadproc.h"
  +#include "fileio.h"
   #include "apr_private.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
  
  
  
  1.10      +2 -2      apache-2.0/src/lib/apr/threadproc/os2/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/signals.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- signals.c	2000/11/09 06:47:52	1.9
  +++ signals.c	2000/11/14 06:40:07	1.10
  @@ -53,8 +53,8 @@
    */
   
   #define INCL_DOSEXCEPTIONS
  -#include "os2/threadproc.h"
  -#include "os2/fileio.h"
  +#include "threadproc.h"
  +#include "fileio.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.16      +1 -1      apache-2.0/src/lib/apr/threadproc/os2/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/thread.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- thread.c	2000/11/09 06:47:52	1.15
  +++ thread.c	2000/11/14 06:40:07	1.16
  @@ -54,7 +54,7 @@
   
   #define INCL_DOSERRORS
   #define INCL_DOS
  -#include "os2/threadproc.h"
  +#include "threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.12      +2 -2      apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadpriv.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- threadpriv.c	2000/11/09 06:47:52	1.11
  +++ threadpriv.c	2000/11/14 06:40:07	1.12
  @@ -52,12 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  -#include "os2/threadproc.h"
  +#include "threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_errno.h"
   #include "apr_lib.h"
  -#include "os2/fileio.h"
  +#include "fileio.h"
   
   apr_status_t apr_create_thread_private(apr_threadkey_t **key,
                                        void (*dest)(void *), apr_pool_t *cont)
  
  
  

Mime
View raw message