Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 42074 invoked by uid 500); 9 Nov 2000 06:25:31 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 42063 invoked by uid 500); 9 Nov 2000 06:25:30 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: 9 Nov 2000 06:25:30 -0000 Message-ID: <20001109062530.42059.qmail@locus.apache.org> From: rbb@locus.apache.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src/lib/apr/locks/win32 locks.c locks.h rbb 00/11/08 22:25:30 Modified: src/lib/apr/locks/beos Makefile.in crossproc.c intraproc.c locks.c src/lib/apr/locks/os2 Makefile.in locks.c src/lib/apr/locks/unix Makefile.in crossproc.c intraproc.c locks.c src/lib/apr/locks/win32 locks.c Removed: src/lib/apr/locks/beos locks.h src/lib/apr/locks/os2 locks.h src/lib/apr/locks/unix locks.h src/lib/apr/locks/win32 locks.h Log: Move all of the lock private header files to an arch directory under the include directory. All private header files for APR are being moved. This allows platforms that only implement some of the APR types to compile cleanly. Revision Changes Path 1.8 +1 -2 apache-2.0/src/lib/apr/locks/beos/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- Makefile.in 2000/04/30 17:58:27 1.7 +++ Makefile.in 2000/11/09 06:25:28 1.8 @@ -9,8 +9,7 @@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) INCDIR=../../include -INCDIR1=../../file_io/unix -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I. +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch LIB=liblock.a 1.17 +1 -1 apache-2.0/src/lib/apr/locks/beos/crossproc.c Index: crossproc.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/crossproc.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -r1.16 -r1.17 --- crossproc.c 2000/08/06 06:07:14 1.16 +++ crossproc.c 2000/11/09 06:25:28 1.17 @@ -52,7 +52,7 @@ * . */ -#include "locks.h" +#include "beos/locks.h" apr_status_t lock_inter_cleanup(void * data) { 1.13 +1 -1 apache-2.0/src/lib/apr/locks/beos/intraproc.c Index: intraproc.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/intraproc.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -r1.12 -r1.13 --- intraproc.c 2000/08/06 06:07:14 1.12 +++ intraproc.c 2000/11/09 06:25:28 1.13 @@ -52,7 +52,7 @@ * . */ -#include "locks.h" +#include "beos/locks.h" apr_status_t lock_intra_cleanup(void *data) { 1.20 +1 -1 apache-2.0/src/lib/apr/locks/beos/locks.c Index: locks.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- locks.c 2000/08/02 05:26:19 1.19 +++ locks.c 2000/11/09 06:25:28 1.20 @@ -52,7 +52,7 @@ * . */ -#include "locks.h" +#include "beos/locks.h" apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type, apr_lockscope_e scope, const char *fname, 1.9 +2 -4 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.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- Makefile.in 2000/04/30 17:58:27 1.8 +++ Makefile.in 2000/11/09 06:25:28 1.9 @@ -8,10 +8,8 @@ CFLAGS=@CFLAGS@ @OPTIM@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR=../../inc -INCDIR1=../../include -INCDIR2=../../file_io/os2 -INCLUDES=-I$(INCDIR) -I$(INCDIR1) -I$(INCDIR2) -I. +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch LIB=lock.a 1.20 +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.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- locks.c 2000/08/06 16:35:53 1.19 +++ locks.c 2000/11/09 06:25:28 1.20 @@ -55,8 +55,8 @@ #include "apr_general.h" #include "apr_lib.h" #include "apr_strings.h" -#include "locks.h" -#include "fileio.h" +#include "os2/locks.h" +#include "os2/fileio.h" #include #define INCL_DOS #include 1.15 +24 -24 apache-2.0/src/lib/apr/locks/unix/Makefile.in Index: Makefile.in =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/Makefile.in,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.in 2000/07/23 17:24:50 1.14 +++ Makefile.in 2000/11/09 06:25:29 1.15 @@ -9,9 +9,8 @@ CFLAGS=@CFLAGS@ @OPTIM@ LIBS=@LIBS@ LDFLAGS=@LDFLAGS@ $(LIBS) -INCDIR1=../../include -INCDIR2=../../file_io/unix -INCLUDES=-I$(INCDIR1) -I$(INCDIR2) -I. +INCDIR=../../include +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch #LIB=liblock.a @@ -51,24 +50,25 @@ && rm Makefile.new # DO NOT REMOVE -crossproc.o: crossproc.c ../../include/apr.h \ - ../../include/apr_strings.h ../../include/apr_lib.h \ - ../../include/apr_pools.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_general.h \ - ../../include/apr_errno.h ../../include/apr_time.h \ - ../../include/apr_tables.h locks.h ../../include/apr_private.h \ - ../../include/apr_lock.h -intraproc.o: intraproc.c locks.h ../../include/apr.h \ - ../../include/apr_private.h ../../include/apr_general.h \ - ../../include/apr_errno.h ../../include/apr_lib.h \ - ../../include/apr_pools.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_time.h \ - ../../include/apr_tables.h ../../include/apr_lock.h -locks.o: locks.c locks.h ../../include/apr.h \ - ../../include/apr_private.h ../../include/apr_general.h \ - ../../include/apr_errno.h ../../include/apr_lib.h \ - ../../include/apr_pools.h ../../include/apr_thread_proc.h \ - ../../include/apr_file_io.h ../../include/apr_time.h \ - ../../include/apr_tables.h ../../include/apr_lock.h \ - ../../include/apr_strings.h ../../include/apr_portable.h \ - ../../include/apr_network_io.h ../../include/apr_dso.h +crossproc.o: crossproc.c $(INCDIR)/apr.h \ + $(INCDIR)/apr_strings.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)/apr_time.h \ + $(INCDIR)/apr_tables.h $(INCDIR)/arch/unix/locks.h \ + $(INCDIR)/apr_private.h $(INCDIR)/apr_lock.h +intraproc.o: intraproc.c $(INCDIR)/arch/unix/locks.h \ + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \ + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.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_lock.h +locks.o: locks.c $(INCDIR)/arch/unix/locks.h $(INCDIR)/apr.h \ + $(INCDIR)/apr_private.h $(INCDIR)/apr_general.h \ + $(INCDIR)/apr_errno.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_lock.h \ + $(INCDIR)/apr_strings.h $(INCDIR)/apr_portable.h \ + $(INCDIR)/apr_network_io.h $(INCDIR)/apr_dso.h 1.38 +1 -1 apache-2.0/src/lib/apr/locks/unix/crossproc.c Index: crossproc.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/crossproc.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -r1.37 -r1.38 --- crossproc.c 2000/08/02 05:26:20 1.37 +++ crossproc.c 2000/11/09 06:25:29 1.38 @@ -54,7 +54,7 @@ #include "apr.h" #include "apr_strings.h" -#include "locks.h" +#include "unix/locks.h" #if APR_USE_SYSVSEM_SERIALIZE 1.18 +1 -1 apache-2.0/src/lib/apr/locks/unix/intraproc.c Index: intraproc.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/intraproc.c,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- intraproc.c 2000/08/02 05:26:20 1.17 +++ intraproc.c 2000/11/09 06:25:29 1.18 @@ -52,7 +52,7 @@ * . */ -#include "locks.h" +#include "unix/locks.h" #if APR_HAS_THREADS 1.41 +1 -1 apache-2.0/src/lib/apr/locks/unix/locks.c Index: locks.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.c,v retrieving revision 1.40 retrieving revision 1.41 diff -u -r1.40 -r1.41 --- locks.c 2000/08/11 16:38:32 1.40 +++ locks.c 2000/11/09 06:25:29 1.41 @@ -52,7 +52,7 @@ * . */ -#include "locks.h" +#include "unix/locks.h" #include "apr_strings.h" #include "apr_portable.h" 1.32 +1 -1 apache-2.0/src/lib/apr/locks/win32/locks.c Index: locks.c =================================================================== RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- locks.c 2000/10/06 17:24:39 1.31 +++ locks.c 2000/11/09 06:25:30 1.32 @@ -54,7 +54,7 @@ #include "apr_general.h" #include "apr_strings.h" -#include "locks.h" +#include "win32/locks.h" #include "apr_portable.h" apr_status_t apr_create_lock(apr_lock_t **lock, apr_locktype_e type,