httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r..@locus.apache.org
Subject cvs commit: apache-2.0/src/lib/apr/threadproc/win32 proc.c signals.c thread.c threadpriv.c threadproc.h
Date Thu, 09 Nov 2000 06:47:54 GMT
rbb         00/11/08 22:47:54

  Modified:    src/lib/apr/threadproc/beos Makefile.in proc.c thread.c
                        threadpriv.c
               src/lib/apr/threadproc/os2 Makefile.in proc.c signals.c
                        thread.c threadpriv.c
               src/lib/apr/threadproc/unix Makefile.in proc.c procsup.c
                        signals.c thread.c threadpriv.c
               src/lib/apr/threadproc/win32 proc.c signals.c thread.c
                        threadpriv.c
  Removed:     src/lib/apr/threadproc/beos threadproc.h
               src/lib/apr/threadproc/os2 threadproc.h
               src/lib/apr/threadproc/unix threadproc.h
               src/lib/apr/threadproc/win32 threadproc.h
  Log:
  Move all of the threadproc private header files to an arch directory under
  the include directory.  All private header files for APR are being moved.
  This allows platforms that only implement some of the APR types to compile
  cleanly.
  
  Revision  Changes    Path
  1.14      +1 -2      apache-2.0/src/lib/apr/threadproc/beos/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/Makefile.in,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- Makefile.in	2000/05/16 23:43:36	1.13
  +++ Makefile.in	2000/11/09 06:47:52	1.14
  @@ -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=libthreadproc.a
   
  
  
  
  1.31      +1 -1      apache-2.0/src/lib/apr/threadproc/beos/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/proc.c,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- proc.c	2000/08/06 06:07:31	1.30
  +++ proc.c	2000/11/09 06:47:52	1.31
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "beos/threadproc.h"
   
   struct send_pipe {
   	int in;
  
  
  
  1.13      +1 -1      apache-2.0/src/lib/apr/threadproc/beos/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/thread.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- thread.c	2000/08/02 05:26:39	1.12
  +++ thread.c	2000/11/09 06:47:52	1.13
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "beos/threadproc.h"
   
   apr_status_t apr_create_threadattr(apr_threadattr_t **new, apr_pool_t *cont)
   {
  
  
  
  1.12      +1 -1      apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadpriv.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- threadpriv.c	2000/08/02 05:26:39	1.11
  +++ threadpriv.c	2000/11/09 06:47:52	1.12
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "beos/threadproc.h"
   
   static struct beos_key key_table[BEOS_MAX_DATAKEYS];
   static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
  
  
  
  1.10      +1 -3      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- Makefile.in	2000/04/30 17:58:33	1.9
  +++ Makefile.in	2000/11/09 06:47:52	1.10
  @@ -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.
  +INCLUDES=-I$(INCDIR) -I$(INCDIR)/arch
   
   LIB=threadproc.a
   
  
  
  
  1.32      +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.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- proc.c	2000/10/05 17:32:44	1.31
  +++ proc.c	2000/11/09 06:47:52	1.32
  @@ -55,8 +55,8 @@
   #define INCL_DOS
   #define INCL_DOSERRORS
   
  -#include "threadproc.h"
  -#include "fileio.h"
  +#include "os2/threadproc.h"
  +#include "os2/fileio.h"
   #include "apr_private.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- signals.c	2000/08/06 14:44:56	1.8
  +++ signals.c	2000/11/09 06:47:52	1.9
  @@ -53,8 +53,8 @@
    */
   
   #define INCL_DOSEXCEPTIONS
  -#include "threadproc.h"
  -#include "fileio.h"
  +#include "os2/threadproc.h"
  +#include "os2/fileio.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.15      +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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- thread.c	2000/08/06 06:07:31	1.14
  +++ thread.c	2000/11/09 06:47:52	1.15
  @@ -54,7 +54,7 @@
   
   #define INCL_DOSERRORS
   #define INCL_DOS
  -#include "threadproc.h"
  +#include "os2/threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.11      +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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- threadpriv.c	2000/08/02 05:26:41	1.10
  +++ threadpriv.c	2000/11/09 06:47:52	1.11
  @@ -52,12 +52,12 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "os2/threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_errno.h"
   #include "apr_lib.h"
  -#include "fileio.h"
  +#include "os2/fileio.h"
   
   apr_status_t apr_create_thread_private(apr_threadkey_t **key,
                                        void (*dest)(void *), apr_pool_t *cont)
  
  
  
  1.24      +32 -30    apache-2.0/src/lib/apr/threadproc/unix/Makefile.in
  
  Index: Makefile.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/Makefile.in,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- Makefile.in	2000/07/24 22:42:05	1.23
  +++ Makefile.in	2000/11/09 06:47:53	1.24
  @@ -10,8 +10,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=libthreadproc.a
   
  @@ -53,40 +52,43 @@
   	    && rm Makefile.new
   
   # DO NOT REMOVE
  -proc.o: proc.c threadproc.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
  - ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h \
  - $(INCDIR)/apr_strings.h $(INCDIR)/apr_portable.h \
  - $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h \
  - $(INCDIR)/apr_dso.h
  -procsup.o: procsup.c threadproc.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
  - ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h
  -signals.o: signals.c threadproc.h $(INCDIR)/apr.h \
  - $(INCDIR)/apr_private.h $(INCDIR)/apr_thread_proc.h \
  - $(INCDIR)/apr_file_io.h $(INCDIR)/apr_general.h \
  - $(INCDIR)/apr_errno.h $(INCDIR)/apr_time.h \
  - ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h
  +proc.o: proc.c $(INCDIR)/arch/unix/threadproc.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/arch/unix/fileio.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h $(INCDIR)/apr_strings.h \
  + $(INCDIR)/apr_portable.h $(INCDIR)/apr_network_io.h \
  + $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h
  +procsup.o: procsup.c $(INCDIR)/arch/unix/threadproc.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/arch/unix/fileio.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h
  +signals.o: signals.c $(INCDIR)/arch/unix/threadproc.h \
  + $(INCDIR)/apr.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
  + $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
  + $(INCDIR)/apr_time.h $(INCDIR)/arch/unix/fileio.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h
   thread.o: thread.c $(INCDIR)/apr.h $(INCDIR)/apr_portable.h \
    $(INCDIR)/apr_general.h $(INCDIR)/apr_errno.h \
    $(INCDIR)/apr_thread_proc.h $(INCDIR)/apr_file_io.h \
    $(INCDIR)/apr_time.h $(INCDIR)/apr_network_io.h \
  - $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h threadproc.h \
  - $(INCDIR)/apr_private.h ../../file_io/unix/fileio.h \
  - $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h \
  - $(INCDIR)/apr_tables.h
  + $(INCDIR)/apr_lock.h $(INCDIR)/apr_dso.h \
  + $(INCDIR)/arch/unix/threadproc.h $(INCDIR)/apr_private.h \
  + $(INCDIR)/arch/unix/fileio.h $(INCDIR)/apr_tables.h \
  + $(INCDIR)/apr_lib.h $(INCDIR)/apr_pools.h
   threadpriv.o: threadpriv.c $(INCDIR)/apr.h \
    $(INCDIR)/apr_portable.h $(INCDIR)/apr_general.h \
    $(INCDIR)/apr_errno.h $(INCDIR)/apr_thread_proc.h \
    $(INCDIR)/apr_file_io.h $(INCDIR)/apr_time.h \
    $(INCDIR)/apr_network_io.h $(INCDIR)/apr_lock.h \
  - $(INCDIR)/apr_dso.h threadproc.h $(INCDIR)/apr_private.h \
  - ../../file_io/unix/fileio.h $(INCDIR)/apr_lib.h \
  - $(INCDIR)/apr_pools.h $(INCDIR)/apr_tables.h
  + $(INCDIR)/apr_dso.h $(INCDIR)/arch/unix/threadproc.h \
  + $(INCDIR)/apr_private.h $(INCDIR)/arch/unix/fileio.h \
  + $(INCDIR)/apr_tables.h $(INCDIR)/apr_lib.h \
  + $(INCDIR)/apr_pools.h
  
  
  
  1.40      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/proc.c,v
  retrieving revision 1.39
  retrieving revision 1.40
  diff -u -r1.39 -r1.40
  --- proc.c	2000/10/18 06:09:09	1.39
  +++ proc.c	2000/11/09 06:47:53	1.40
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "unix/threadproc.h"
   #include "apr_strings.h"
   #include "apr_portable.h"
   
  
  
  
  1.25      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/procsup.c,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- procsup.c	2000/10/23 21:26:56	1.24
  +++ procsup.c	2000/11/09 06:47:53	1.25
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "unix/threadproc.h"
   
   apr_status_t apr_detach(void)
   {
  
  
  
  1.13      +2 -2      apache-2.0/src/lib/apr/threadproc/unix/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/signals.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- signals.c	2000/08/02 05:26:41	1.12
  +++ signals.c	2000/11/09 06:47:53	1.13
  @@ -53,9 +53,9 @@
    */
   
   #ifndef BEOS
  -#include "threadproc.h"
  +#include "unix/threadproc.h"
   #else
  -#include "../beos/threadproc.h"
  +#include "beos/threadproc.h"
   #endif
   #include "apr_private.h"
   #include "apr_lib.h"
  
  
  
  1.30      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/thread.c,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- thread.c	2000/08/02 05:26:42	1.29
  +++ thread.c	2000/11/09 06:47:53	1.30
  @@ -54,7 +54,7 @@
   
   #include "apr.h"
   #include "apr_portable.h"
  -#include "threadproc.h"
  +#include "unix/threadproc.h"
   
   #if APR_HAS_THREADS
   
  
  
  
  1.27      +1 -1      apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadpriv.c,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- threadpriv.c	2000/08/31 20:38:59	1.26
  +++ threadpriv.c	2000/11/09 06:47:53	1.27
  @@ -54,7 +54,7 @@
   
   #include "apr.h"
   #include "apr_portable.h"
  -#include "threadproc.h"
  +#include "unix/threadproc.h"
   
   #if APR_HAS_THREADS
   
  
  
  
  1.38      +2 -2      apache-2.0/src/lib/apr/threadproc/win32/proc.c
  
  Index: proc.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/proc.c,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- proc.c	2000/10/06 17:24:41	1.37
  +++ proc.c	2000/11/09 06:47:54	1.38
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  -#include "fileio.h"
  +#include "win32/threadproc.h"
  +#include "win32/fileio.h"
   
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
  
  
  
  1.10      +2 -2      apache-2.0/src/lib/apr/threadproc/win32/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/signals.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- signals.c	2000/10/06 17:24:41	1.9
  +++ signals.c	2000/11/09 06:47:54	1.10
  @@ -52,8 +52,8 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  -#include "fileio.h"
  +#include "win32/threadproc.h"
  +#include "win32/fileio.h"
   #include "apr_thread_proc.h"
   #include "apr_file_io.h"
   #include "apr_general.h"
  
  
  
  1.26      +1 -1      apache-2.0/src/lib/apr/threadproc/win32/thread.c
  
  Index: thread.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/thread.c,v
  retrieving revision 1.25
  retrieving revision 1.26
  diff -u -r1.25 -r1.26
  --- thread.c	2000/10/06 17:52:44	1.25
  +++ thread.c	2000/11/09 06:47:54	1.26
  @@ -53,7 +53,7 @@
    */
   
   #include "apr_private.h"
  -#include "threadproc.h"
  +#include "win32/threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  
  1.21      +1 -1      apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c
  
  Index: threadpriv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadpriv.c,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- threadpriv.c	2000/10/06 17:24:41	1.20
  +++ threadpriv.c	2000/11/09 06:47:54	1.21
  @@ -52,7 +52,7 @@
    * <http://www.apache.org/>.
    */
   
  -#include "threadproc.h"
  +#include "win32/threadproc.h"
   #include "apr_thread_proc.h"
   #include "apr_general.h"
   #include "apr_lib.h"
  
  
  

Mime
View raw message