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 threadcancel.c threadpriv.c threadproc.h
Date Mon, 03 Apr 2000 18:37:57 GMT
rbb         00/04/03 11:37:56

  Modified:    src/lib/apr/dso/aix dso.c dso.h
               src/lib/apr/dso/beos dso.h
               src/lib/apr/dso/os2 dso.h
               src/lib/apr/dso/unix dso.c dso.h
               src/lib/apr/file_io/os2 dir.c fileio.h
               src/lib/apr/file_io/unix dir.c fileio.h
               src/lib/apr/file_io/win32 dir.c fileio.h
               src/lib/apr/include apr_dso.h apr_file_io.h apr_general.h
                        apr_lib.h apr_lock.h apr_mmap.h apr_network_io.h
                        apr_pools.h apr_portable.h apr_thread_proc.h
               src/lib/apr/lib apr_pools.c apr_tables.c
               src/lib/apr/locks/beos crossproc.c intraproc.c locks.c
                        locks.h
               src/lib/apr/locks/os2 locks.c locks.h
               src/lib/apr/locks/unix crossproc.c intraproc.c locks.c
                        locks.h
               src/lib/apr/locks/win32 locks.c locks.h
               src/lib/apr/misc/beos misc.h start.c
               src/lib/apr/misc/unix getopt.c misc.h start.c
               src/lib/apr/misc/win32 getopt.c misc.h names.c start.c
               src/lib/apr/mmap/beos mmap.c mmap_h.h
               src/lib/apr/mmap/unix mmap.c mmap_h.h
               src/lib/apr/network_io/beos networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/network_io/os2 networkio.h poll.c sendrecv.c
                        sockets.c sockopt.c
               src/lib/apr/network_io/unix networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/network_io/win32 networkio.h poll.c sendrecv.c
                        sockaddr.c sockets.c sockopt.c
               src/lib/apr/threadproc/beos proc.c procsup.c signals.c
                        thread.c threadcancel.c threadpriv.c threadproc.h
               src/lib/apr/threadproc/os2 proc.c signals.c thread.c
                        threadcancel.c threadpriv.c threadproc.h
               src/lib/apr/threadproc/unix proc.c procsup.c signals.c
                        thread.c threadcancel.c threadpriv.c threadproc.h
               src/lib/apr/threadproc/win32 proc.c signals.c thread.c
                        threadcancel.c threadpriv.c threadproc.h
  Log:
  fix the rest of the struct foo_t to struct ap_foo_t.  Next is removing the
  struct's where possible.
  
  Revision  Changes    Path
  1.2       +3 -3      apache-2.0/src/lib/apr/dso/aix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.c,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dso.c	2000/04/02 15:00:22	1.1
  +++ dso.c	2000/04/03 18:36:51	1.2
  @@ -134,7 +134,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_load(struct dso_handle_t **res_handle, const char *path, 
  +ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, 
                           ap_context_t *ctx)
   {
       void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL);
  @@ -148,7 +148,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dso_unload(struct dso_handle_t *handle)
  +ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle)
   {
       if (dlclose(handle->handle) != 0)
           return APR_EINIT;
  @@ -157,7 +157,7 @@
   }
   
   ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
  -                       struct dso_handle_t *handle, 
  +                       struct ap_dso_handle_t *handle, 
                          const char *symname)
   {
       void *retval = dlsym(handle->handle, symname);
  
  
  
  1.2       +1 -1      apache-2.0/src/lib/apr/dso/aix/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/aix/dso.h,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- dso.h	2000/04/02 15:00:23	1.1
  +++ dso.h	2000/04/03 18:36:51	1.2
  @@ -65,7 +65,7 @@
   const char *dlerror(void);
   int dlclose(void *handle);
   
  -struct dso_handle_t {
  +struct ap_dso_handle_t {
       ap_context_t  *cont;
       void          *handle;
   };
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/dso/beos/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/beos/dso.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- dso.h	2000/03/31 08:35:44	1.3
  +++ dso.h	2000/04/03 18:36:52	1.4
  @@ -62,7 +62,7 @@
   #include "apr_dso.h"
   #include <kernel/image.h>
   
  -struct dso_handle_t {
  +struct ap_dso_handle_t {
       image_id       handle;    /* Handle to the DSO loaded */
       ap_context_t   *cont;
   };
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/dso/os2/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/os2/dso.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dso.h	2000/03/31 08:35:45	1.4
  +++ dso.h	2000/04/03 18:36:54	1.5
  @@ -63,7 +63,7 @@
   #include "apr_pools.h"
   #include "apr_dso.h"
   
  -struct dso_handle_t {
  +struct ap_dso_handle_t {
       HMODULE       handle;     /* Handle to the DSO loaded            */
       ap_context_t  *cont;       /* Context for returning error strings */
   };
  
  
  
  1.7       +3 -3      apache-2.0/src/lib/apr/dso/unix/dso.c
  
  Index: dso.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- dso.c	2000/04/02 15:00:23	1.6
  +++ dso.c	2000/04/03 18:36:55	1.7
  @@ -70,7 +70,7 @@
    * arg 2) Path to the DSO library
    * arg 3) Context to use. 
    */
  -ap_status_t ap_dso_load(struct dso_handle_t **res_handle, const char *path, 
  +ap_status_t ap_dso_load(struct ap_dso_handle_t **res_handle, const char *path, 
                           ap_context_t *ctx)
   {
   #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
  @@ -96,7 +96,7 @@
    *    Close a DSO library.
    * arg 1) handle to close.
    */
  -ap_status_t ap_dso_unload(struct dso_handle_t *handle)
  +ap_status_t ap_dso_unload(struct ap_dso_handle_t *handle)
   {
   #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
       shl_unload((shl_t)handle->handle);
  @@ -117,7 +117,7 @@
    * arg 3) Name of the symbol to load.
    */
   ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
  -                       struct dso_handle_t *handle, 
  +                       struct ap_dso_handle_t *handle, 
                          const char *symname)
   {
   #if defined(HPUX) || defined(HPUX10) || defined(HPUX11)
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/dso/unix/dso.h
  
  Index: dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/dso/unix/dso.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- dso.h	2000/04/02 14:24:34	1.4
  +++ dso.h	2000/04/03 18:36:55	1.5
  @@ -82,7 +82,7 @@
   #define DLSYM_NEEDS_UNDERSCORE
   #endif
   
  -struct dso_handle_t {
  +struct ap_dso_handle_t {
       ap_context_t  *cont;
       void          *handle;
   };
  
  
  
  1.8       +10 -10    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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- dir.c	2000/03/31 08:35:47	1.7
  +++ dir.c	2000/04/03 18:36:56	1.8
  @@ -62,15 +62,15 @@
   
   static ap_status_t dir_cleanup(void *thedir)
   {
  -    struct dir_t *dir = thedir;
  +    struct ap_dir_t *dir = thedir;
       return ap_closedir(dir);
   }
   
   
   
  -ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t *cntxt)
  +ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t *cntxt)
   {
  -    struct dir_t *thedir = (struct dir_t *)ap_palloc(cntxt, sizeof(struct dir_t));
  +    struct ap_dir_t *thedir = (struct ap_dir_t *)ap_palloc(cntxt, sizeof(struct ap_dir_t));
       
       if (thedir == NULL)
           return APR_ENOMEM;
  @@ -90,7 +90,7 @@
   
   
   
  -ap_status_t ap_closedir(struct dir_t *thedir)
  +ap_status_t ap_closedir(struct ap_dir_t *thedir)
   {
       int rv = 0;
       
  @@ -107,7 +107,7 @@
   
   
   
  -ap_status_t ap_readdir(struct dir_t *thedir)
  +ap_status_t ap_readdir(struct ap_dir_t *thedir)
   {
       int rv;
       ULONG entries = 1;
  @@ -136,7 +136,7 @@
   
   
   
  -ap_status_t ap_rewinddir(struct dir_t *thedir)
  +ap_status_t ap_rewinddir(struct ap_dir_t *thedir)
   {
       return ap_closedir(thedir);
   }
  @@ -157,7 +157,7 @@
   
   
   
  -ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir)
   {
       if (thedir->validentry) {
           *size = thedir->entry.cbFile;
  @@ -169,7 +169,7 @@
   
   
   
  -ap_status_t ap_dir_entry_mtime(ap_time_t *time, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_mtime(ap_time_t *time, struct ap_dir_t *thedir)
   {
       if (thedir->validentry) {
           ap_os2_time_to_ap_time(time, thedir->entry.fdateLastWrite, thedir->entry.ftimeLastWrite);
  @@ -181,7 +181,7 @@
   
   
   
  -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir)
   {
       int rc;
       HFILE hFile;
  @@ -216,7 +216,7 @@
   
   
   
  -ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
  +ap_status_t ap_get_dir_filename(char **new, struct ap_dir_t *thedir)
   {
       if (thedir->validentry) {
           *new = thedir->entry.achName;
  
  
  
  1.13      +1 -1      apache-2.0/src/lib/apr/file_io/os2/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/os2/fileio.h,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- fileio.h	2000/04/03 17:14:04	1.12
  +++ fileio.h	2000/04/03 18:36:57	1.13
  @@ -82,7 +82,7 @@
       unsigned long filePtr;    // position in file of handle
   };
   
  -struct dir_t {
  +struct ap_dir_t {
       ap_context_t *cntxt;
       char *dirname;
       ULONG handle;
  
  
  
  1.23      +13 -13    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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- dir.c	2000/04/03 16:03:14	1.22
  +++ dir.c	2000/04/03 18:37:00	1.23
  @@ -57,7 +57,7 @@
   
   static ap_status_t dir_cleanup(void *thedir)
   {
  -    struct dir_t *dir = thedir;
  +    struct ap_dir_t *dir = thedir;
       if (closedir(dir->dirstruct) == 0) {
           return APR_SUCCESS;
       }
  @@ -73,14 +73,14 @@
    * arg 2) The full path to the directory (use / on all systems)
    * arg 3) The context to use.
    */                        
  -ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t *cont)
  +ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t *cont)
   {
       if (new == NULL)
           return APR_EBADARG;
       if (cont == NULL)
           return APR_ENOCONT;
   
  -    (*new) = (struct dir_t *)ap_palloc(cont, sizeof(struct dir_t));
  +    (*new) = (struct ap_dir_t *)ap_palloc(cont, sizeof(struct ap_dir_t));
   
       (*new)->cntxt = cont;
       (*new)->dirname = ap_pstrdup(cont, dirname);
  @@ -102,7 +102,7 @@
    *    close the specified directory. 
    * arg 1) the directory descriptor to close.
    */                        
  -ap_status_t ap_closedir(struct dir_t *thedir)
  +ap_status_t ap_closedir(struct ap_dir_t *thedir)
   {
       ap_status_t rv;
   
  @@ -122,7 +122,7 @@
    * arg 1) the directory descriptor to read from, and fill out.
    * NOTE: All systems return . and .. as the first two files.
    */                        
  -ap_status_t ap_readdir(struct dir_t *thedir)
  +ap_status_t ap_readdir(struct ap_dir_t *thedir)
   {
   #if APR_HAS_THREADS && defined(_POSIX_THREAD_SAFE_FUNCTIONS) \
       && !defined(READDIR_IS_THREAD_SAFE)
  @@ -159,7 +159,7 @@
    *    Rewind the directory to the first entry. 
    * arg 1) the directory descriptor to rewind.
    */                        
  -ap_status_t ap_rewinddir(struct dir_t *thedir)
  +ap_status_t ap_rewinddir(struct ap_dir_t *thedir)
   {
       if (thedir == NULL)
           return APR_EBADARG;
  @@ -216,7 +216,7 @@
    * arg 1) the size of the directory entry. 
    * arg 2) the currently open directory.
    */                        
  -ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;    
  @@ -245,7 +245,7 @@
    * arg 1) the last modified time of the directory entry. 
    * arg 2) the currently open directory.
    */                        
  -ap_status_t ap_dir_entry_mtime(ap_time_t *mtime, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_mtime(ap_time_t *mtime, struct ap_dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -275,7 +275,7 @@
    * arg 1) the file type of the directory entry. 
    * arg 2) the currently open directory.
    */                        
  -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir)
   {
       struct stat filestat;
       char *fname = NULL;
  @@ -320,7 +320,7 @@
    * arg 1) the file name of the directory entry. 
    * arg 2) the currently open directory.
    */                        
  -ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
  +ap_status_t ap_get_dir_filename(char **new, struct ap_dir_t *thedir)
   {
       if (new == NULL)
           return APR_EBADARG;
  @@ -340,7 +340,7 @@
    * arg 1) The os specific dir we are converting to
    * arg 2) The apr dir to convert.
    */   
  -ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct dir_t *dir)
  +ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct ap_dir_t *dir)
   {
       if (dir == NULL) {
           return APR_ENODIR;
  @@ -357,14 +357,14 @@
    * arg 2) The os specific dir to convert
    * arg 3) The context to use when creating to apr directory.
    */
  -ap_status_t ap_put_os_dir(struct dir_t **dir, ap_os_dir_t *thedir,
  +ap_status_t ap_put_os_dir(struct ap_dir_t **dir, ap_os_dir_t *thedir,
                             ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*dir) == NULL) {
  -        (*dir) = (struct dir_t *)ap_palloc(cont, sizeof(struct dir_t));
  +        (*dir) = (struct ap_dir_t *)ap_palloc(cont, sizeof(struct ap_dir_t));
           (*dir)->cntxt = cont;
       }
       (*dir)->dirstruct = thedir;
  
  
  
  1.12      +1 -1      apache-2.0/src/lib/apr/file_io/unix/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/unix/fileio.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- fileio.h	2000/04/03 17:14:06	1.11
  +++ fileio.h	2000/04/03 18:37:00	1.12
  @@ -112,7 +112,7 @@
       int timeout;
   };
   
  -struct dir_t {
  +struct ap_dir_t {
       ap_context_t *cntxt;
       char *dirname;
       DIR *dirstruct;
  
  
  
  1.15      +13 -13    apache-2.0/src/lib/apr/file_io/win32/dir.c
  
  Index: dir.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/dir.c,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- dir.c	2000/03/31 08:35:51	1.14
  +++ dir.c	2000/04/03 18:37:03	1.15
  @@ -75,17 +75,17 @@
   
   ap_status_t dir_cleanup(void *thedir)
   {
  -    struct dir_t *dir = thedir;
  +    struct ap_dir_t *dir = thedir;
       if (!CloseHandle(dir->dirhand)) {
           return GetLastError();
       }
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_opendir(struct dir_t **new, const char *dirname, ap_context_t *cont)
  +ap_status_t ap_opendir(struct ap_dir_t **new, const char *dirname, ap_context_t *cont)
   {
       char * temp;
  -    (*new) = ap_palloc(cont, sizeof(struct dir_t));
  +    (*new) = ap_palloc(cont, sizeof(struct ap_dir_t));
       (*new)->cntxt = cont;
       (*new)->entry = NULL;
       temp = canonical_filename((*new)->cntxt, dirname);
  @@ -101,7 +101,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_closedir(struct dir_t *thedir)
  +ap_status_t ap_closedir(struct ap_dir_t *thedir)
   {
       if (!FindClose(thedir->dirhand)) {
           return GetLastError();   
  @@ -110,7 +110,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_readdir(struct dir_t *thedir)
  +ap_status_t ap_readdir(struct ap_dir_t *thedir)
   {
       if (thedir->dirhand == INVALID_HANDLE_VALUE) {
           thedir->entry = ap_palloc(thedir->cntxt, sizeof(WIN32_FIND_DATA));
  @@ -126,7 +126,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_rewinddir(struct dir_t *thedir)
  +ap_status_t ap_rewinddir(struct ap_dir_t *thedir)
   {
       ap_status_t stat;
       ap_context_t *cont = thedir->cntxt;
  @@ -161,7 +161,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_size(ap_ssize_t *size, struct ap_dir_t *thedir)
   {
       if (thedir == NULL || thedir->entry == NULL) {
           return APR_ENODIR;
  @@ -171,7 +171,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_dir_entry_mtime(time_t *time, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_mtime(time_t *time, struct ap_dir_t *thedir)
   {
       if (thedir == NULL || thedir->entry == NULL) {
           return APR_ENODIR;
  @@ -180,7 +180,7 @@
       return APR_SUCCESS;
   }
    
  -ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct dir_t *thedir)
  +ap_status_t ap_dir_entry_ftype(ap_filetype_e *type, struct ap_dir_t *thedir)
   {
       switch(thedir->entry->dwFileAttributes) {
       case FILE_ATTRIBUTE_DIRECTORY: {
  @@ -198,13 +198,13 @@
       }
   }
   
  -ap_status_t ap_get_dir_filename(char **new, struct dir_t *thedir)
  +ap_status_t ap_get_dir_filename(char **new, struct ap_dir_t *thedir)
   {
       (*new) = ap_pstrdup(thedir->cntxt, thedir->entry->cFileName);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct dir_t *dir)
  +ap_status_t ap_get_os_dir(ap_os_dir_t **thedir, struct ap_dir_t *dir)
   {
       if (dir == NULL) {
           return APR_ENODIR;
  @@ -213,13 +213,13 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_dir(struct dir_t **dir, ap_os_dir_t *thedir, ap_context_t *cont)
  +ap_status_t ap_put_os_dir(struct ap_dir_t **dir, ap_os_dir_t *thedir, ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*dir) == NULL) {
  -        (*dir) = (struct dir_t *)ap_palloc(cont, sizeof(struct dir_t));
  +        (*dir) = (struct ap_dir_t *)ap_palloc(cont, sizeof(struct ap_dir_t));
           (*dir)->cntxt = cont;
       }
       (*dir)->dirhand = thedir;
  
  
  
  1.11      +3 -3      apache-2.0/src/lib/apr/file_io/win32/fileio.h
  
  Index: fileio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/file_io/win32/fileio.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- fileio.h	2000/04/03 17:14:09	1.10
  +++ fileio.h	2000/04/03 18:37:03	1.11
  @@ -112,7 +112,7 @@
       time_t ctime;
   };
   
  -struct dir_t {
  +struct ap_dir_t {
       ap_context_t *cntxt;
       char *dirname;
       HANDLE dirhand;
  @@ -122,9 +122,9 @@
   ap_status_t file_cleanup(void *);
   /*mode_t get_fileperms(ap_fileperms_t);
   */
  -API_EXPORT(char *) ap_os_systemcase_filename(struct context_t *pCont, 
  +API_EXPORT(char *) ap_os_systemcase_filename(struct ap_context_t *pCont, 
                                                const char *szFile);
  -char * canonical_filename(struct context_t *pCont, const char *szFile);
  +char * canonical_filename(struct ap_context_t *pCont, const char *szFile);
   
   #endif  /* ! FILE_IO_H */
   
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/include/apr_dso.h
  
  Index: apr_dso.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_dso.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- apr_dso.h	2000/03/31 08:35:55	1.4
  +++ apr_dso.h	2000/04/03 18:37:05	1.5
  @@ -62,7 +62,7 @@
   extern "C" {
   #endif
   
  -typedef struct dso_handle_t        ap_dso_handle_t;
  +typedef struct ap_dso_handle_t        ap_dso_handle_t;
   typedef void *                     ap_dso_handle_sym_t;
   
   ap_status_t ap_dso_init(void);
  
  
  
  1.38      +1 -1      apache-2.0/src/lib/apr/include/apr_file_io.h
  
  Index: apr_file_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_file_io.h,v
  retrieving revision 1.37
  retrieving revision 1.38
  diff -u -r1.37 -r1.38
  --- apr_file_io.h	2000/04/03 17:14:11	1.37
  +++ apr_file_io.h	2000/04/03 18:37:05	1.38
  @@ -106,7 +106,7 @@
   
   typedef struct ap_file_t            ap_file_t;
   typedef struct ap_finfo_t        ap_finfo_t;
  -typedef struct dir_t             ap_dir_t;
  +typedef struct ap_dir_t             ap_dir_t;
   typedef ap_int32_t               ap_fileperms_t;
   typedef uid_t                    ap_uid_t;
   typedef gid_t                    ap_gid_t;
  
  
  
  1.21      +2 -2      apache-2.0/src/lib/apr/include/apr_general.h
  
  Index: apr_general.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_general.h,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- apr_general.h	2000/03/31 08:35:55	1.20
  +++ apr_general.h	2000/04/03 18:37:06	1.21
  @@ -81,7 +81,7 @@
   
   #define MAXIMUM_WAIT_OBJECTS 64
   
  -typedef struct context_t  ap_context_t;
  +typedef struct ap_context_t  ap_context_t;
   typedef int               ap_signum_t;
   
   #ifdef SIGHUP
  @@ -220,7 +220,7 @@
   
   /* Context functions */
   ap_status_t ap_create_context(ap_context_t **newcont, ap_context_t *cont);
  -ap_status_t ap_destroy_context(struct context_t *cont);
  +ap_status_t ap_destroy_context(struct ap_context_t *cont);
   ap_status_t ap_exit(ap_context_t *);
   ap_status_t ap_set_userdata(void *data, char *key, 
                               ap_status_t (*cleanup) (void *), 
  
  
  
  1.24      +21 -21    apache-2.0/src/lib/apr/include/apr_lib.h
  
  Index: apr_lib.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lib.h,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- apr_lib.h	2000/03/31 08:35:55	1.23
  +++ apr_lib.h	2000/04/03 18:37:07	1.24
  @@ -264,8 +264,8 @@
    * APR memory structure manipulators (pools, tables, and arrays).
    */
   API_EXPORT(ap_pool_t *) ap_make_sub_pool(ap_pool_t *p, int (*apr_abort)(int retcode));
  -API_EXPORT(void) ap_clear_pool(struct context_t *p);
  -API_EXPORT(void) ap_destroy_pool(struct context_t *p);
  +API_EXPORT(void) ap_clear_pool(struct ap_context_t *p);
  +API_EXPORT(void) ap_destroy_pool(struct ap_context_t *p);
   API_EXPORT(long) ap_bytes_in_pool(ap_pool_t *p);
   API_EXPORT(long) ap_bytes_in_free_blocks(void);
   API_EXPORT(ap_pool_t *) ap_find_pool(const void *ts);
  @@ -283,32 +283,32 @@
   #endif /* POOL_DEBUG */
   
   
  -API_EXPORT(void *) ap_palloc(struct context_t *c, int reqsize);
  -API_EXPORT(void *) ap_pcalloc(struct context_t *p, int size);
  -API_EXPORT(char *) ap_pstrdup(struct context_t *p, const char *s);
  -API_EXPORT(char *) ap_pstrndup(struct context_t *p, const char *s, int n);
  -API_EXPORT_NONSTD(char *) ap_pstrcat(struct context_t *p, ...);
  -API_EXPORT(char *) ap_pvsprintf(struct context_t *p, const char *fmt, va_list ap);
  -API_EXPORT_NONSTD(char *) ap_psprintf(struct context_t *p, const char *fmt, ...);
  -API_EXPORT(ap_array_header_t *) ap_make_array(struct context_t *p, int nelts,
  +API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize);
  +API_EXPORT(void *) ap_pcalloc(struct ap_context_t *p, int size);
  +API_EXPORT(char *) ap_pstrdup(struct ap_context_t *p, const char *s);
  +API_EXPORT(char *) ap_pstrndup(struct ap_context_t *p, const char *s, int n);
  +API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_context_t *p, ...);
  +API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *p, const char *fmt, va_list ap);
  +API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, ...);
  +API_EXPORT(ap_array_header_t *) ap_make_array(struct ap_context_t *p, int nelts,
   						int elt_size);
   API_EXPORT(void *) ap_push_array(ap_array_header_t *arr);
   API_EXPORT(void) ap_array_cat(ap_array_header_t *dst,
   			       const ap_array_header_t *src);
  -API_EXPORT(ap_array_header_t *) ap_copy_array(struct context_t *p,
  +API_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_context_t *p,
   						const ap_array_header_t *arr);
   API_EXPORT(ap_array_header_t *)
  -	ap_copy_array_hdr(struct context_t *p,
  +	ap_copy_array_hdr(struct ap_context_t *p,
   			   const ap_array_header_t *arr);
   API_EXPORT(ap_array_header_t *)
  -	ap_append_arrays(struct context_t *p,
  +	ap_append_arrays(struct ap_context_t *p,
   			  const ap_array_header_t *first,
   			  const ap_array_header_t *second);
  -API_EXPORT(char *) ap_array_pstrcat(struct context_t *p,
  +API_EXPORT(char *) ap_array_pstrcat(struct ap_context_t *p,
   				     const ap_array_header_t *arr,
   				     const char sep);
  -API_EXPORT(ap_table_t *) ap_make_table(struct context_t *p, int nelts);
  -API_EXPORT(ap_table_t *) ap_copy_table(struct context_t *p, const ap_table_t *t);
  +API_EXPORT(ap_table_t *) ap_make_table(struct ap_context_t *p, int nelts);
  +API_EXPORT(ap_table_t *) ap_copy_table(struct ap_context_t *p, const ap_table_t *t);
   API_EXPORT(void) ap_clear_table(ap_table_t *t);
   API_EXPORT(const char *) ap_table_get(const ap_table_t *t, const char *key);
   API_EXPORT(void) ap_table_set(ap_table_t *t, const char *key,
  @@ -324,7 +324,7 @@
   			       const char *val);
   API_EXPORT(void) ap_table_addn(ap_table_t *t, const char *key,
   				const char *val);
  -API_EXPORT(ap_table_t *) ap_overlay_tables(struct context_t *p,
  +API_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_context_t *p,
   					     const ap_table_t *overlay,
   					     const ap_table_t *base);
   API_EXPORT(void)
  @@ -334,18 +334,18 @@
   #define AP_OVERLAP_TABLES_MERGE (1)
   API_EXPORT(void) ap_overlap_tables(ap_table_t *a, const ap_table_t *b,
   				    unsigned flags);
  -API_EXPORT(void) ap_register_cleanup(struct context_t *p, void *data,
  +API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data,
   				      ap_status_t (*plain_cleanup) (void *),
   				      ap_status_t (*child_cleanup) (void *));
  -API_EXPORT(void) ap_kill_cleanup(struct context_t *p, void *data,
  +API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data,
   				  ap_status_t (*cleanup) (void *));
  -API_EXPORT(void) ap_run_cleanup(struct context_t *p, void *data,
  +API_EXPORT(void) ap_run_cleanup(struct ap_context_t *p, void *data,
   				 ap_status_t (*cleanup) (void *));
   API_EXPORT(void) ap_cleanup_for_exec(void);
   API_EXPORT(ap_status_t) ap_getpass(const char *prompt, char *pwbuf, size_t *bufsize);
   API_EXPORT_NONSTD(ap_status_t) ap_null_cleanup(void *data);
   
  -API_EXPORT(void) ap_note_subprocess(struct context_t *a, ap_proc_t *pid,
  +API_EXPORT(void) ap_note_subprocess(struct ap_context_t *a, ap_proc_t *pid,
   				     enum kill_conditions how);
   API_EXPORT(int)
   	ap_spawn_child(ap_context_t *p,
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/include/apr_lock.h
  
  Index: apr_lock.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_lock.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- apr_lock.h	2000/03/31 08:35:55	1.8
  +++ apr_lock.h	2000/04/03 18:37:07	1.9
  @@ -66,7 +66,7 @@
   
   typedef enum {APR_MUTEX, APR_READWRITE} ap_locktype_e;
   
  -typedef struct lock_t           ap_lock_t;
  +typedef struct ap_lock_t           ap_lock_t;
   
   /*   Function definitions */
   ap_status_t ap_create_lock(ap_lock_t **lock, ap_locktype_e type, 
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/include/apr_mmap.h
  
  Index: apr_mmap.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_mmap.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- apr_mmap.h	2000/03/31 08:35:56	1.6
  +++ apr_mmap.h	2000/04/03 18:37:07	1.7
  @@ -65,7 +65,7 @@
   #endif /* __cplusplus */
   
   
  -typedef struct mmap_t            ap_mmap_t;
  +typedef struct ap_mmap_t            ap_mmap_t;
   
   /*   Function definitions */
   
  
  
  
  1.25      +4 -4      apache-2.0/src/lib/apr/include/apr_network_io.h
  
  Index: apr_network_io.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_network_io.h,v
  retrieving revision 1.24
  retrieving revision 1.25
  diff -u -r1.24 -r1.25
  --- apr_network_io.h	2000/03/31 08:35:56	1.24
  +++ apr_network_io.h	2000/04/03 18:37:07	1.25
  @@ -120,14 +120,14 @@
   #define ap_inet_addr    inet_network
   #endif
   
  -typedef struct socket_t     ap_socket_t;
  -typedef struct pollfd_t     ap_pollfd_t;
  -typedef struct hdtr_t       ap_hdtr_t;
  +typedef struct ap_socket_t     ap_socket_t;
  +typedef struct ap_pollfd_t     ap_pollfd_t;
  +typedef struct ap_hdtr_t       ap_hdtr_t;
   typedef struct in_addr      ap_in_addr;
   
   #if APR_HAS_SENDFILE
   /* A structure to encapsulate headers and trailers for ap_sendfile */
  -struct hdtr_t {
  +struct ap_hdtr_t {
       struct iovec* headers;
       int numheaders;
       struct iovec* trailers;
  
  
  
  1.12      +1 -1      apache-2.0/src/lib/apr/include/apr_pools.h
  
  Index: apr_pools.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_pools.h,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- apr_pools.h	2000/03/31 08:35:56	1.11
  +++ apr_pools.h	2000/04/03 18:37:07	1.12
  @@ -153,7 +153,7 @@
   
   /* routines to allocate memory from an pool... */
   
  -API_EXPORT_NONSTD(char *) ap_psprintf(struct context_t *, const char *fmt, ...)
  +API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *, const char *fmt, ...)
       __attribute__((format(printf,2,3)));
   
   /* array and alist management... keeping lists of things.
  
  
  
  1.28      +4 -4      apache-2.0/src/lib/apr/include/apr_portable.h
  
  Index: apr_portable.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_portable.h,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- apr_portable.h	2000/03/31 08:35:56	1.27
  +++ apr_portable.h	2000/04/03 18:37:08	1.28
  @@ -112,7 +112,7 @@
   #elif defined(BEOS)
   #include <kernel/OS.h>
   
  -struct os_lock_t {
  +struct ap_os_lock_t {
   	/* Inter proc */
   	sem_id sem_interproc;
   	int32  ben_interproc;
  @@ -124,7 +124,7 @@
   typedef int                   ap_os_file_t;
   typedef DIR                   ap_os_dir_t;
   typedef int                   ap_os_sock_t;
  -typedef struct os_lock_t      ap_os_lock_t;
  +typedef struct ap_os_lock_t      ap_os_lock_t;
   typedef thread_id             ap_os_thread_t;
   typedef thread_id             ap_os_proc_t;
   typedef int                   ap_os_threadkey_t;
  @@ -145,7 +145,7 @@
   };
   #endif
   
  -struct os_lock_t {
  +struct ap_os_lock_t {
   #if APR_USE_SYSVSEM_SERIALIZE
       int crossproc;
   #elif APR_USE_FCNTL_SERIALIZE
  @@ -168,7 +168,7 @@
   typedef int                   ap_os_file_t;
   typedef DIR                   ap_os_dir_t;
   typedef int                   ap_os_sock_t;
  -typedef struct os_lock_t      ap_os_lock_t;
  +typedef struct ap_os_lock_t      ap_os_lock_t;
   #if APR_HAS_THREADS && APR_HAVE_PTHREAD_H 
   typedef pthread_t             ap_os_thread_t;
   typedef pthread_key_t         ap_os_threadkey_t;
  
  
  
  1.15      +8 -8      apache-2.0/src/lib/apr/include/apr_thread_proc.h
  
  Index: apr_thread_proc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/include/apr_thread_proc.h,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- apr_thread_proc.h	2000/03/31 08:35:56	1.14
  +++ apr_thread_proc.h	2000/04/03 18:37:08	1.15
  @@ -77,12 +77,12 @@
   #define APR_CANCEL_ENABLE      3
   #define APR_CANCEL_DISABLE     4
   
  -typedef struct thread_t           ap_thread_t;
  -typedef struct threadattr_t       ap_threadattr_t;
  -typedef struct proc_t		  ap_proc_t;
  -typedef struct procattr_t         ap_procattr_t;
  +typedef struct ap_thread_t           ap_thread_t;
  +typedef struct ap_threadattr_t       ap_threadattr_t;
  +typedef struct ap_proc_t		  ap_proc_t;
  +typedef struct ap_procattr_t         ap_procattr_t;
   
  -typedef struct threadkey_t        ap_key_t;
  +typedef struct ap_threadkey_t        ap_key_t;
   
   typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *);
   
  @@ -119,12 +119,12 @@
   ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont);
   ap_status_t ap_setprocattr_io(ap_procattr_t *attr, ap_int32_t in, 
                                 ap_int32_t out, ap_int32_t err);
  -ap_status_t ap_setprocattr_childin(struct procattr_t *attr, ap_file_t *child_in,
  +ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in,
                                      ap_file_t *parent_in);
  -ap_status_t ap_setprocattr_childout(struct procattr_t *attr, 
  +ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, 
                                       ap_file_t *child_out, 
                                       ap_file_t *parent_out);
  -ap_status_t ap_setprocattr_childerr(struct procattr_t *attr, 
  +ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, 
                                       ap_file_t *child_err,
                                       ap_file_t *parent_err);
   ap_status_t ap_setprocattr_dir(ap_procattr_t *attr, const char *dir);
  
  
  
  1.39      +13 -13    apache-2.0/src/lib/apr/lib/apr_pools.c
  
  Index: apr_pools.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_pools.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- apr_pools.c	2000/03/31 08:35:59	1.38
  +++ apr_pools.c	2000/04/03 18:37:12	1.39
  @@ -598,7 +598,7 @@
   }
   #endif
   
  -API_EXPORT(void) ap_register_cleanup(struct context_t *p, void *data,
  +API_EXPORT(void) ap_register_cleanup(struct ap_context_t *p, void *data,
   				      ap_status_t (*plain_cleanup) (void *),
   				      ap_status_t (*child_cleanup) (void *))
   {
  @@ -614,7 +614,7 @@
       }
   }
   
  -API_EXPORT(void) ap_kill_cleanup(struct context_t *p, void *data,
  +API_EXPORT(void) ap_kill_cleanup(struct ap_context_t *p, void *data,
   				  ap_status_t (*cleanup) (void *))
   {
       struct cleanup *c;
  @@ -635,7 +635,7 @@
       }
   }
   
  -API_EXPORT(void) ap_run_cleanup(struct context_t *p, void *data,
  +API_EXPORT(void) ap_run_cleanup(struct ap_context_t *p, void *data,
   				 ap_status_t (*cleanup) (void *))
   {
       ap_block_alarms();		/* Run cleanup only once! */
  @@ -780,7 +780,7 @@
       ap_unblock_alarms();
   }
   
  -API_EXPORT(void) ap_clear_pool(struct context_t *a)
  +API_EXPORT(void) ap_clear_pool(struct ap_context_t *a)
   {
       ap_clear_real_pool(a->pool);
   }
  @@ -811,7 +811,7 @@
       ap_unblock_alarms();
   }
   
  -API_EXPORT(void) ap_destroy_pool(struct context_t *a)
  +API_EXPORT(void) ap_destroy_pool(struct ap_context_t *a)
   {
       ap_destroy_real_pool(a->pool);
   }
  @@ -1028,7 +1028,7 @@
   #endif
   }
   
  -API_EXPORT(void *) ap_palloc(struct context_t *c, int reqsize)
  +API_EXPORT(void *) ap_palloc(struct ap_context_t *c, int reqsize)
   {
       if (c == NULL) {
           return malloc(reqsize);
  @@ -1036,14 +1036,14 @@
       return ap_pool_palloc(c->pool, reqsize, c->apr_abort);
   }
   
  -API_EXPORT(void *) ap_pcalloc(struct context_t *a, int size)
  +API_EXPORT(void *) ap_pcalloc(struct ap_context_t *a, int size)
   {
       void *res = ap_palloc(a, size);
       memset(res, '\0', size);
       return res;
   }
   
  -API_EXPORT(char *) ap_pstrdup(struct context_t *a, const char *s)
  +API_EXPORT(char *) ap_pstrdup(struct ap_context_t *a, const char *s)
   {
       char *res;
       size_t len;
  @@ -1057,7 +1057,7 @@
       return res;
   }
   
  -API_EXPORT(char *) ap_pstrndup(struct context_t *a, const char *s, int n)
  +API_EXPORT(char *) ap_pstrndup(struct ap_context_t *a, const char *s, int n)
   {
       char *res;
   
  @@ -1070,7 +1070,7 @@
       return res;
   }
   
  -API_EXPORT_NONSTD(char *) ap_pstrcat(struct context_t *a, ...)
  +API_EXPORT_NONSTD(char *) ap_pstrcat(struct ap_context_t *a, ...)
   {
       char *cp, *argp, *res;
   
  @@ -1195,7 +1195,7 @@
   #endif
   }
   
  -API_EXPORT(char *) ap_pvsprintf(struct context_t *c, const char *fmt, va_list ap)
  +API_EXPORT(char *) ap_pvsprintf(struct ap_context_t *c, const char *fmt, va_list ap)
   {
   #ifdef ALLOC_USE_MALLOC
       ap_pool_t *p = c->pool;
  @@ -1260,7 +1260,7 @@
   #endif
   }
   
  -API_EXPORT_NONSTD(char *) ap_psprintf(struct context_t *p, const char *fmt, ...)
  +API_EXPORT_NONSTD(char *) ap_psprintf(struct ap_context_t *p, const char *fmt, ...)
   {
       va_list ap;
       char *res;
  @@ -1283,7 +1283,7 @@
    * generic interface, but for now, it's a special case
    */
   
  -API_EXPORT(void) ap_note_subprocess(struct context_t *a, ap_proc_t *pid,
  +API_EXPORT(void) ap_note_subprocess(struct ap_context_t *a, ap_proc_t *pid,
   				     enum kill_conditions how)
   {
       struct process_chain *new =
  
  
  
  1.11      +9 -9      apache-2.0/src/lib/apr/lib/apr_tables.c
  
  Index: apr_tables.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/lib/apr_tables.c,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- apr_tables.c	2000/03/31 08:36:00	1.10
  +++ apr_tables.c	2000/04/03 18:37:12	1.11
  @@ -88,7 +88,7 @@
    * The 'array' functions...
    */
   
  -static void make_array_core(ap_array_header_t *res, struct context_t *c,
  +static void make_array_core(ap_array_header_t *res, struct ap_context_t *c,
   			    int nelts, int elt_size)
   {
       /*
  @@ -107,7 +107,7 @@
       res->nalloc = nelts;	/* ...but this many allocated */
   }
   
  -API_EXPORT(ap_array_header_t *) ap_make_array(struct context_t *p,
  +API_EXPORT(ap_array_header_t *) ap_make_array(struct ap_context_t *p,
   						int nelts, int elt_size)
   {
       ap_array_header_t *res;
  @@ -159,7 +159,7 @@
       dst->nelts += src->nelts;
   }
   
  -API_EXPORT(ap_array_header_t *) ap_copy_array(struct context_t *p,
  +API_EXPORT(ap_array_header_t *) ap_copy_array(struct ap_context_t *p,
   						const ap_array_header_t *arr)
   {
       ap_array_header_t *res = ap_make_array(p, arr->nalloc, arr->elt_size);
  @@ -186,7 +186,7 @@
   }
   
   API_EXPORT(ap_array_header_t *)
  -    ap_copy_array_hdr(struct context_t *p,
  +    ap_copy_array_hdr(struct ap_context_t *p,
   		       const ap_array_header_t *arr)
   {
       ap_array_header_t *res;
  @@ -200,7 +200,7 @@
   /* The above is used here to avoid consing multiple new array bodies... */
   
   API_EXPORT(ap_array_header_t *)
  -    ap_append_arrays(struct context_t *p,
  +    ap_append_arrays(struct ap_context_t *p,
   		      const ap_array_header_t *first,
   		      const ap_array_header_t *second)
   {
  @@ -216,7 +216,7 @@
    * or if there are no elements in the array.
    * If sep is non-NUL, it will be inserted between elements as a separator.
    */
  -API_EXPORT(char *) ap_array_pstrcat(struct context_t *p,
  +API_EXPORT(char *) ap_array_pstrcat(struct ap_context_t *p,
   				     const ap_array_header_t *arr,
   				     const char sep)
   {
  @@ -293,7 +293,7 @@
   #endif /* MAKE_TABLE_PROFILE */
   
   
  -API_EXPORT(ap_table_t *) ap_make_table(struct context_t *p, int nelts)
  +API_EXPORT(ap_table_t *) ap_make_table(struct ap_context_t *p, int nelts)
   {
       ap_table_t *t = ap_palloc(p, sizeof(ap_table_t));
   
  @@ -304,7 +304,7 @@
       return t;
   }
   
  -API_EXPORT(ap_table_t *) ap_copy_table(struct context_t *p, const ap_table_t *t)
  +API_EXPORT(ap_table_t *) ap_copy_table(struct ap_context_t *p, const ap_table_t *t)
   {
       ap_table_t *new = ap_palloc(p, sizeof(ap_table_t));
   
  @@ -534,7 +534,7 @@
       elts->val = (char *)val;
   }
   
  -API_EXPORT(ap_table_t *) ap_overlay_tables(struct context_t *p,
  +API_EXPORT(ap_table_t *) ap_overlay_tables(struct ap_context_t *p,
   					     const ap_table_t *overlay,
   					     const ap_table_t *base)
   {
  
  
  
  1.10      +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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- crossproc.c	2000/03/31 08:36:03	1.9
  +++ crossproc.c	2000/04/03 18:37:13	1.10
  @@ -123,7 +123,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname)
   {
       return APR_SUCCESS;
   }
  
  
  
  1.9       +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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- intraproc.c	2000/03/31 08:36:03	1.8
  +++ intraproc.c	2000/04/03 18:37:13	1.9
  @@ -68,7 +68,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_intra_lock(struct lock_t *new)
  +ap_status_t create_intra_lock(struct ap_lock_t *new)
   {
       int32 stat;
       new->sem_intraproc = (sem_id)ap_palloc(new->cntxt, sizeof(sem_id));
  
  
  
  1.12      +6 -6      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- locks.c	2000/03/31 08:36:03	1.11
  +++ locks.c	2000/04/03 18:37:13	1.12
  @@ -54,14 +54,14 @@
   
   #include "locks.h"
   
  -ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, 
  +ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, 
                              ap_lockscope_e scope, char *fname, 
                              ap_context_t *cont)
   {
  -    struct lock_t *new;
  +    struct ap_lock_t *new;
       ap_status_t stat;
       
  -    new = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +    new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
       if (new == NULL){
           return APR_ENOMEM;
       }
  @@ -134,7 +134,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(struct lock_t **lock, char *fname, ap_context_t *cont)
  +ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_t *cont)
   {
       ap_status_t stat;
       if ((*lock)->scope != APR_CROSS_PROCESS) {
  @@ -145,7 +145,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
  +ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data)
   {
       if (lock != NULL) {
           return ap_get_userdata(data, key, lock->cntxt);
  @@ -156,7 +156,7 @@
       }
   }
   
  -ap_status_t ap_set_lockdata(struct lock_t *lock, void *data, char *key,
  +ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/locks/beos/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/beos/locks.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- locks.h	2000/03/31 08:36:03	1.5
  +++ locks.h	2000/04/03 18:37:13	1.6
  @@ -61,7 +61,7 @@
   #include "apr_general.h"
   #include "apr_lib.h"
   
  -struct lock_t {
  +struct ap_lock_t {
       ap_context_t *cntxt;
       ap_locktype_e type;
       ap_lockscope_e scope;
  
  
  
  1.10      +8 -8      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- locks.c	2000/03/31 08:36:04	1.9
  +++ locks.c	2000/04/03 18:37:14	1.10
  @@ -71,20 +71,20 @@
   
   static ap_status_t lock_cleanup(void *thelock)
   {
  -    struct lock_t *lock = thelock;
  +    struct ap_lock_t *lock = thelock;
       return ap_destroy_lock(lock);
   }
   
   
   
  -ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont)
  +ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, ap_lockscope_e scope, char *fname, ap_context_t *cont)
   {
  -    struct lock_t *new;
  +    struct ap_lock_t *new;
       ULONG rc;
       char *semname;
       PIB *ppib;
   
  -    new = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +    new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
       new->cntxt = cont;
       new->type  = type;
       new->scope = scope;
  @@ -114,7 +114,7 @@
       int rc;
       PIB *ppib;
   
  -    *lock = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +    *lock = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
   
       if (lock == NULL)
           return APR_ENOMEM;
  @@ -132,7 +132,7 @@
   
   
   
  -ap_status_t ap_lock(struct lock_t *lock)
  +ap_status_t ap_lock(struct ap_lock_t *lock)
   {
       ULONG rc;
       
  @@ -148,7 +148,7 @@
   
   
   
  -ap_status_t ap_unlock(struct lock_t *lock)
  +ap_status_t ap_unlock(struct ap_lock_t *lock)
   {
       ULONG rc;
       
  @@ -163,7 +163,7 @@
   
   
   
  -ap_status_t ap_destroy_lock(struct lock_t *lock)
  +ap_status_t ap_destroy_lock(struct ap_lock_t *lock)
   {
       ULONG rc;
       ap_status_t stat = APR_SUCCESS;
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/locks/os2/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/os2/locks.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- locks.h	2000/03/31 08:36:04	1.5
  +++ locks.h	2000/04/03 18:37:15	1.6
  @@ -60,7 +60,7 @@
   #define INCL_DOS
   #include <os2.h>
   
  -struct lock_t {
  +struct ap_lock_t {
       ap_context_t *cntxt;
       ap_locktype_e type;
       ap_lockscope_e scope;
  
  
  
  1.21      +26 -26    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.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- crossproc.c	2000/03/31 08:36:05	1.20
  +++ crossproc.c	2000/04/03 18:37:16	1.21
  @@ -70,7 +70,7 @@
   
   ap_status_t lock_cleanup(void *lock_)
   {
  -    struct lock_t *lock=lock_;
  +    struct ap_lock_t *lock=lock_;
       union semun ick;
       
       if (lock->interproc != -1) {
  @@ -80,7 +80,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(struct lock_t *new)
  +ap_status_t create_inter_lock(struct ap_lock_t *new)
   {
       union semun ick;
       struct semid_ds buf;
  @@ -101,7 +101,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_inter(struct lock_t *lock)
  +ap_status_t lock_inter(struct ap_lock_t *lock)
   {
       lock->curr_locked = 1;
       if (semop(lock->interproc, &op_on, 1) < 0) {
  @@ -110,7 +110,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(struct lock_t *lock)
  +ap_status_t unlock_inter(struct ap_lock_t *lock)
   {
       if (semop(lock->interproc, &op_off, 1) < 0) {
           return errno;
  @@ -119,7 +119,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
   
  @@ -130,7 +130,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -142,7 +142,7 @@
   
   ap_status_t lock_cleanup(void *lock_)
   {
  -    struct lock_t *lock=lock_;
  +    struct ap_lock_t *lock=lock_;
   
       if (lock->curr_locked == 1) {
           if (pthread_mutex_unlock(lock->interproc)) {
  @@ -155,7 +155,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(struct lock_t *new)
  +ap_status_t create_inter_lock(struct ap_lock_t *new)
   {
       ap_status_t stat;
       int fd;
  @@ -198,7 +198,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_inter(struct lock_t *lock)
  +ap_status_t lock_inter(struct ap_lock_t *lock)
   {
       ap_status_t stat;
       lock->curr_locked = 1;
  @@ -208,7 +208,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(struct lock_t *lock)
  +ap_status_t unlock_inter(struct ap_lock_t *lock)
   {
       ap_status_t stat;
   
  @@ -219,7 +219,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
       if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
  @@ -229,7 +229,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -254,7 +254,7 @@
   
   static ap_status_t lock_cleanup(void *lock_)
   {
  -    struct lock_t *lock=lock_;
  +    struct ap_lock_t *lock=lock_;
   
       if (lock->curr_locked == 1) {
           if (fcntl(lock->interproc, F_SETLKW, &unlock_it) < 0) {
  @@ -265,7 +265,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(struct lock_t *new)
  +ap_status_t create_inter_lock(struct ap_lock_t *new)
   {
       new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0644);
   
  @@ -280,7 +280,7 @@
       return APR_SUCCESS; 
   }
   
  -ap_status_t lock_inter(struct lock_t *lock)
  +ap_status_t lock_inter(struct ap_lock_t *lock)
   {
       lock->curr_locked=1;
       if (fcntl(lock->interproc, F_SETLKW, &lock_it) < 0) {
  @@ -289,7 +289,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(struct lock_t *lock)
  +ap_status_t unlock_inter(struct ap_lock_t *lock)
   {
       if (fcntl(lock->interproc, F_SETLKW, &unlock_it) < 0) {
           return errno;
  @@ -298,7 +298,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
       if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
  @@ -308,7 +308,7 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname)
   {
       return APR_SUCCESS;
   }
  @@ -320,7 +320,7 @@
   
   ap_status_t lock_cleanup(void *lock_)
   {
  -    struct lock_t *lock=lock_;
  +    struct ap_lock_t *lock=lock_;
   
       if (lock->curr_locked == 1) {
           if (flock(lock->interproc, LOCK_UN) < 0) {
  @@ -332,7 +332,7 @@
       return APR_SUCCESS;
   }    
   
  -ap_status_t create_inter_lock(struct lock_t *new)
  +ap_status_t create_inter_lock(struct ap_lock_t *new)
   {
       new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0600);
   
  @@ -345,7 +345,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_inter(struct lock_t *lock)
  +ap_status_t lock_inter(struct ap_lock_t *lock)
   {
       lock->curr_locked = 1;
       if (flock(lock->interproc, LOCK_EX) < 0) {
  @@ -354,7 +354,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t unlock_inter(struct lock_t *lock)
  +ap_status_t unlock_inter(struct ap_lock_t *lock)
   {
       if (flock(lock->interproc, LOCK_UN) < 0) {
           return errno;
  @@ -363,7 +363,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t destroy_inter_lock(struct lock_t *lock)
  +ap_status_t destroy_inter_lock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
       if ((stat = lock_cleanup(lock)) == APR_SUCCESS) {
  @@ -373,11 +373,11 @@
       return stat;
   }
   
  -ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, char *fname)
  +ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, char *fname)
   {
  -    struct lock_t *new;
  +    struct ap_lock_t *new;
   
  -    new = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +    new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
   
       new->fname = ap_pstrdup(cont, fname);
       new->interproc = open(new->fname, O_CREAT | O_WRONLY | O_EXCL, 0600);
  
  
  
  1.12      +5 -5      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- intraproc.c	2000/03/31 08:36:05	1.11
  +++ intraproc.c	2000/04/03 18:37:16	1.12
  @@ -60,11 +60,11 @@
   
   ap_status_t lock_intra_cleanup(void *data)
   {
  -    struct lock_t *lock = (struct lock_t *) data;
  +    struct ap_lock_t *lock = (struct ap_lock_t *) data;
       return pthread_mutex_unlock(lock->intraproc);
   }    
   
  -ap_status_t create_intra_lock(struct lock_t *new)
  +ap_status_t create_intra_lock(struct ap_lock_t *new)
   {
       ap_status_t stat;
       pthread_mutexattr_t mattr;
  @@ -95,12 +95,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t lock_intra(struct lock_t *lock)
  +ap_status_t lock_intra(struct ap_lock_t *lock)
   {
       return pthread_mutex_lock(lock->intraproc);
   }
   
  -ap_status_t unlock_intra(struct lock_t *lock)
  +ap_status_t unlock_intra(struct ap_lock_t *lock)
   {
       ap_status_t status;
   
  @@ -108,7 +108,7 @@
       return status;
   }
   
  -ap_status_t destroy_intra_lock(struct lock_t *lock)
  +ap_status_t destroy_intra_lock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
       if ((stat = lock_intra_cleanup(lock)) == APR_SUCCESS) {
  
  
  
  1.23      +12 -12    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.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- locks.c	2000/03/31 08:36:05	1.22
  +++ locks.c	2000/04/03 18:37:16	1.23
  @@ -76,14 +76,14 @@
    * NOTE:  APR_CROSS_PROCESS may lock both processes and threads, but it is
    *        only guaranteed to lock processes.
    */
  -ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, 
  +ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, 
                              ap_lockscope_e scope, char *fname, 
                              ap_context_t *cont)
   {
  -    struct lock_t *new;
  +    struct ap_lock_t *new;
       ap_status_t stat;
   
  -    new = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +    new = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
   
       new->cntxt = cont;
       new->type  = type;
  @@ -124,7 +124,7 @@
    *    Lock a protected region. 
    * arg 1) The lock to set.
    */
  -ap_status_t ap_lock(struct lock_t *lock)
  +ap_status_t ap_lock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
       if (lock->scope != APR_CROSS_PROCESS) {
  @@ -149,7 +149,7 @@
    *    Unlock a protected region. 
    * arg 1) The lock to reset.
    */
  -ap_status_t ap_unlock(struct lock_t *lock)
  +ap_status_t ap_unlock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
   
  @@ -177,7 +177,7 @@
    * NOTE:  If the lock is currently active when it is destroyed, it 
    *        will be unlocked first.
    */
  -ap_status_t ap_destroy_lock(struct lock_t *lock)
  +ap_status_t ap_destroy_lock(struct ap_lock_t *lock)
   {
       ap_status_t stat;
       if (lock->scope != APR_CROSS_PROCESS) {
  @@ -212,7 +212,7 @@
    *        idea to call it regardless, because it makes the code more
    *        portable. 
    */
  -ap_status_t ap_child_init_lock(struct lock_t **lock, char *fname, ap_context_t *cont)
  +ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_t *cont)
   {
       ap_status_t stat;
       if ((*lock)->scope != APR_CROSS_PROCESS) {
  @@ -230,7 +230,7 @@
    * arg 2) The key to use when retreiving data associated with this lock
    * arg 3) The user data associated with the lock.
    */
  -ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
  +ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data)
   {
       if (lock != NULL) {
           return ap_get_userdata(data, key, lock->cntxt);
  @@ -250,7 +250,7 @@
    * arg 3) The key to use when associating data with this lock
    * arg 4) The cleanup to use when the lock is destroyed.
    */
  -ap_status_t ap_set_lockdata(struct lock_t *lock, void *data, char *key,
  +ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  @@ -268,7 +268,7 @@
    * arg 1) The os specific lock we are converting to.
    * arg 2) The apr lock to convert.
    */
  -ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, struct lock_t *lock)
  +ap_status_t ap_get_os_lock(ap_os_lock_t *oslock, struct ap_lock_t *lock)
   {
       if (lock == NULL) {
           return APR_ENOLOCK;
  @@ -291,14 +291,14 @@
    * arg 2) The os specific lock to convert.
    * arg 3) The context to use if it is needed.
    */
  -ap_status_t ap_put_os_lock(struct lock_t **lock, ap_os_lock_t *thelock, 
  +ap_status_t ap_put_os_lock(struct ap_lock_t **lock, ap_os_lock_t *thelock, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*lock) == NULL) {
  -        (*lock) = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +        (*lock) = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
           (*lock)->cntxt = cont;
       }
       (*lock)->interproc = thelock->crossproc;
  
  
  
  1.16      +10 -10    apache-2.0/src/lib/apr/locks/unix/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/unix/locks.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- locks.h	2000/03/31 08:36:05	1.15
  +++ locks.h	2000/04/03 18:37:17	1.16
  @@ -108,7 +108,7 @@
   };
   #endif
   
  -struct lock_t {
  +struct ap_lock_t {
       ap_context_t *cntxt;
       ap_locktype_e type;
       ap_lockscope_e scope;
  @@ -138,19 +138,19 @@
   };
   
   #if APR_HAS_THREADS
  -ap_status_t create_intra_lock(struct lock_t *new);
  -ap_status_t lock_intra(struct lock_t *lock);
  -ap_status_t unlock_intra(struct lock_t *lock);
  -ap_status_t destroy_intra_lock(struct lock_t *lock);
  +ap_status_t create_intra_lock(struct ap_lock_t *new);
  +ap_status_t lock_intra(struct ap_lock_t *lock);
  +ap_status_t unlock_intra(struct ap_lock_t *lock);
  +ap_status_t destroy_intra_lock(struct ap_lock_t *lock);
   #endif
   
   void setup_lock();
  -ap_status_t create_inter_lock(struct lock_t *new);
  -ap_status_t lock_inter(struct lock_t *lock);
  -ap_status_t unlock_inter(struct lock_t *lock);
  -ap_status_t destroy_inter_lock(struct lock_t *lock);
  +ap_status_t create_inter_lock(struct ap_lock_t *new);
  +ap_status_t lock_inter(struct ap_lock_t *lock);
  +ap_status_t unlock_inter(struct ap_lock_t *lock);
  +ap_status_t destroy_inter_lock(struct ap_lock_t *lock);
   
  -ap_status_t child_init_lock(struct lock_t **lock, ap_context_t *cont, 
  +ap_status_t child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, 
                               char *fname);
   
   #endif  /* LOCKS_H */
  
  
  
  1.15      +13 -13    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.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- locks.c	2000/03/31 08:36:06	1.14
  +++ locks.c	2000/04/03 18:37:18	1.15
  @@ -57,14 +57,14 @@
   #include "locks.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_create_lock(struct lock_t **lock, ap_locktype_e type, 
  +ap_status_t ap_create_lock(struct ap_lock_t **lock, ap_locktype_e type, 
                              ap_lockscope_e scope, char *fname, 
                              ap_context_t *cont)
   {
  -    struct lock_t *newlock;
  +    struct ap_lock_t *newlock;
       SECURITY_ATTRIBUTES sec;
   
  -    newlock = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +    newlock = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
   
       newlock->cntxt = cont;
       /* ToDo:  How to handle the case when no context is available? 
  @@ -92,12 +92,12 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_child_init_lock(struct lock_t **lock, char *fname, ap_context_t *cont)
  +ap_status_t ap_child_init_lock(struct ap_lock_t **lock, char *fname, ap_context_t *cont)
   {
       /* This routine should not be called (and OpenMutex will fail if called) 
        * on a INTRAPROCESS lock
        */
  -    (*lock) = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +    (*lock) = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
   
       if ((*lock) == NULL) {
           return APR_ENOMEM;
  @@ -111,7 +111,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_lock(struct lock_t *lock)
  +ap_status_t ap_lock(struct ap_lock_t *lock)
   {
       DWORD rv;
       if (lock->scope == APR_INTRAPROCESS) {
  @@ -130,7 +130,7 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_unlock(struct lock_t *lock)
  +ap_status_t ap_unlock(struct ap_lock_t *lock)
   {
       if (lock->scope == APR_INTRAPROCESS) {
           LeaveCriticalSection(&lock->section);
  @@ -143,7 +143,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_destroy_lock(struct lock_t *lock)
  +ap_status_t ap_destroy_lock(struct ap_lock_t *lock)
   {
       if (lock->scope == APR_INTRAPROCESS) {
           DeleteCriticalSection(&lock->section);
  @@ -156,7 +156,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_lockdata(struct lock_t *lock, char *key, void *data)
  +ap_status_t ap_get_lockdata(struct ap_lock_t *lock, char *key, void *data)
   {
       if (lock != NULL) {
           return ap_get_userdata(data, key, lock->cntxt);
  @@ -167,7 +167,7 @@
       }
   }
   
  -ap_status_t ap_set_lockdata(struct lock_t *lock, void *data, char *key,
  +ap_status_t ap_set_lockdata(struct ap_lock_t *lock, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (lock != NULL) {
  @@ -179,7 +179,7 @@
       }
   }
   
  -ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, struct lock_t *lock)
  +ap_status_t ap_get_os_lock(ap_os_lock_t *thelock, struct ap_lock_t *lock)
   {
       if (lock == NULL) {
           return APR_ENOFILE;
  @@ -188,14 +188,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_lock(struct lock_t **lock, ap_os_lock_t *thelock, 
  +ap_status_t ap_put_os_lock(struct ap_lock_t **lock, ap_os_lock_t *thelock, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*lock) == NULL) {
  -        (*lock) = (struct lock_t *)ap_palloc(cont, sizeof(struct lock_t));
  +        (*lock) = (struct ap_lock_t *)ap_palloc(cont, sizeof(struct ap_lock_t));
           (*lock)->cntxt = cont;
       }
       (*lock)->mutex = *thelock;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/locks/win32/locks.h
  
  Index: locks.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/locks/win32/locks.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- locks.h	2000/03/31 08:36:06	1.4
  +++ locks.h	2000/04/03 18:37:18	1.5
  @@ -57,7 +57,7 @@
   
   #include "apr_lock.h"
   
  -struct lock_t {
  +struct ap_lock_t {
       ap_context_t *cntxt;
       ap_locktype_e type;
       ap_lockscope_e scope;
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/misc/beos/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/misc.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- misc.h	2000/03/31 08:36:07	1.8
  +++ misc.h	2000/04/03 18:37:20	1.9
  @@ -79,7 +79,7 @@
       struct datastruct *prev;
   } datastruct;
   
  -struct context_t {
  +struct ap_context_t {
       struct ap_pool_t *pool;
       void *prog_data;
       int (*apr_abort)(int retcode);
  
  
  
  1.14      +4 -4      apache-2.0/src/lib/apr/misc/beos/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/beos/start.c,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- start.c	2000/03/31 08:36:07	1.13
  +++ start.c	2000/04/03 18:37:21	1.14
  @@ -54,7 +54,7 @@
   
   #include "misc.h"
   
  -ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont)
  +ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t *cont)
   {
       ap_context_t *new;
       ap_pool_t *pool;
  @@ -70,7 +70,7 @@
           return APR_ENOPOOL;
       }
       
  -    new = (struct context_t *)ap_palloc(cont, sizeof(struct context_t));
  +    new = (struct ap_context_t *)ap_palloc(cont, sizeof(struct ap_context_t));
       
       new->pool = pool;
       new->prog_data = NULL;
  @@ -87,7 +87,7 @@
   
   ap_status_t ap_set_userdata(void *data, char *key,
                               ap_status_t (*cleanup) (void *),
  -                            struct context_t *cont)
  +                            struct ap_context_t *cont)
   {
       datastruct *dptr = NULL, *dptr2 = NULL;
       if (cont) { 
  @@ -117,7 +117,7 @@
       return APR_ENOCONT;
   }
   
  -ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
  +ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/misc/unix/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/getopt.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- getopt.c	2000/03/14 17:47:37	1.4
  +++ getopt.c	2000/04/03 18:37:22	1.5
  @@ -60,7 +60,7 @@
    * NOTE:  Arguments 2 and 3 are most commonly argc and argv from 
    *        main(argc, argv)
    */
  -ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct context_t *cont)
  +ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct ap_context_t *cont)
   {
       char *p;
       static char *place = EMSG;   /* option letter processing */
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/misc/unix/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/misc.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- misc.h	2000/03/31 08:36:07	1.8
  +++ misc.h	2000/04/03 18:37:23	1.9
  @@ -82,7 +82,7 @@
       struct datastruct *prev;
   } datastruct;
   
  -struct context_t {
  +struct ap_context_t {
       struct ap_pool_t *pool;
       datastruct *prog_data;
       int (*apr_abort)(int retcode);
  
  
  
  1.23      +7 -7      apache-2.0/src/lib/apr/misc/unix/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/unix/start.c,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- start.c	2000/03/31 08:36:07	1.22
  +++ start.c	2000/04/03 18:37:23	1.23
  @@ -64,9 +64,9 @@
    *        of it's parent context's attributes, except the ap_context_t will be a
    *        sub-pool.
    */
  -ap_status_t ap_create_context(struct context_t **newcont, struct context_t *cont)
  +ap_status_t ap_create_context(struct ap_context_t **newcont, struct ap_context_t *cont)
   {
  -    struct context_t *new;
  +    struct ap_context_t *new;
       ap_pool_t *pool;
   
       if (cont) {
  @@ -80,7 +80,7 @@
           return APR_ENOPOOL;
       }   
   
  -    new = (struct context_t *)ap_palloc(cont, sizeof(struct context_t));
  +    new = (struct ap_context_t *)ap_palloc(cont, sizeof(struct ap_context_t));
   
       new->pool = pool;
       new->prog_data = NULL;
  @@ -95,7 +95,7 @@
    *    Free the context and all of it's child contexts'.
    * arg 1) The context to free.
    */
  -ap_status_t ap_destroy_context(struct context_t *cont)
  +ap_status_t ap_destroy_context(struct ap_context_t *cont)
   {
       ap_destroy_pool(cont);
       return APR_SUCCESS;
  @@ -121,7 +121,7 @@
    */
   ap_status_t ap_set_userdata(void *data, char *key,
                               ap_status_t (*cleanup) (void *),
  -                            struct context_t *cont)
  +                            struct ap_context_t *cont)
   {
       datastruct *dptr = NULL, *dptr2 = NULL;
       if (cont) { 
  @@ -158,7 +158,7 @@
    * arg 2) The user data associated with the context.
    * arg 3) The current context.
    */
  -ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
  +ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  @@ -215,7 +215,7 @@
    *        then APR will return an error and expect the calling program to
    *        deal with the error accordingly.
    */
  -ap_status_t ap_set_abort(int (*apr_abort)(int retcode), struct context_t *cont)
  +ap_status_t ap_set_abort(int (*apr_abort)(int retcode), struct ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
  
  
  
  1.4       +1 -1      apache-2.0/src/lib/apr/misc/win32/getopt.c
  
  Index: getopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/getopt.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- getopt.c	2000/03/15 16:33:02	1.3
  +++ getopt.c	2000/04/03 18:37:25	1.4
  @@ -63,7 +63,7 @@
    * NOTE:  Arguments 2 and 3 are most commonly argc and argv from 
    *        main(argc, argv)
    */
  -ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct context_t *cont)
  +ap_status_t ap_getopt(ap_int32_t nargc, char *const *nargv, const char *ostr, ap_int32_t *rv, struct ap_context_t *cont)
   {
       char *p;
       static char *place = EMSG;   /* option letter processing */
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/misc/win32/misc.h
  
  Index: misc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/misc.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- misc.h	2000/03/31 08:36:09	1.7
  +++ misc.h	2000/04/03 18:37:26	1.8
  @@ -67,7 +67,7 @@
       struct datastruct *prev;
   } datastruct;
   
  -struct context_t {
  +struct ap_context_t {
       struct ap_pool_t *pool;
       datastruct *prog_data;
       int (*apr_abort)(int retcode);
  
  
  
  1.5       +2 -2      apache-2.0/src/lib/apr/misc/win32/names.c
  
  Index: names.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/names.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- names.c	2000/03/31 08:36:09	1.4
  +++ names.c	2000/04/03 18:37:27	1.5
  @@ -84,7 +84,7 @@
    * is present on the existing path.  This routine also
    * converts alias names to long names.
    */
  -API_EXPORT(char *) ap_os_systemcase_filename(struct context_t *pCont, 
  +API_EXPORT(char *) ap_os_systemcase_filename(struct ap_context_t *pCont, 
                                                const char *szFile)
   {
       char buf[HUGE_STRING_LEN];
  @@ -203,7 +203,7 @@
   /*  Perform canonicalization with the exception that the
    *  input case is preserved.
    */
  -char * canonical_filename(struct context_t *pCont, const char *szFile)
  +char * canonical_filename(struct ap_context_t *pCont, const char *szFile)
   {
       char *pNewStr;
       char *s;
  
  
  
  1.16      +2 -2      apache-2.0/src/lib/apr/misc/win32/start.c
  
  Index: start.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/misc/win32/start.c,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- start.c	2000/03/31 08:36:09	1.15
  +++ start.c	2000/04/03 18:37:27	1.16
  @@ -144,7 +144,7 @@
   
   ap_status_t ap_set_userdata(void *data, char *key,
                               ap_status_t (*cleanup) (void *),
  -                            struct context_t *cont)
  +                            struct ap_context_t *cont)
   {
       datastruct *dptr = NULL, *dptr2 = NULL;
       if (cont) { 
  @@ -174,7 +174,7 @@
       return APR_ENOCONT;
   }
   
  -ap_status_t ap_get_userdata(void **data, char *key, struct context_t *cont)
  +ap_status_t ap_get_userdata(void **data, char *key, struct ap_context_t *cont)
   {
       datastruct *dptr = NULL;
       if (cont) { 
  
  
  
  1.9       +4 -4      apache-2.0/src/lib/apr/mmap/beos/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- mmap.c	2000/03/31 08:36:09	1.8
  +++ mmap.c	2000/04/03 18:37:28	1.9
  @@ -56,7 +56,7 @@
   
   ap_status_t mmap_cleanup(void *themmap)
   {
  -    struct mmap_t *mm = themmap;
  +    struct ap_mmap_t *mm = themmap;
       int rv;
       rv = delete_area(mm->area);
   
  @@ -69,7 +69,7 @@
           return errno;
   }
   
  -ap_status_t ap_mmap_create(struct mmap_t **new, ap_file_t *file, ap_off_t offset, ap_size_t size,
  +ap_status_t ap_mmap_create(struct ap_mmap_t **new, ap_file_t *file, ap_off_t offset, ap_size_t size,
                   ap_context_t *cont)
   {
       void *mm;
  @@ -79,7 +79,7 @@
   
       if (file == NULL || file->buffered || file->filedes == -1)
           return APR_EBADF;
  -    (*new) = (struct mmap_t *)ap_palloc(cont, sizeof(struct mmap_t));
  +    (*new) = (struct ap_mmap_t *)ap_palloc(cont, sizeof(struct ap_mmap_t));
       
       pages = ((size -1) / B_PAGE_SIZE) + 1;
   
  @@ -108,7 +108,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_mmap_delete(struct mmap_t *mmap)
  +ap_status_t ap_mmap_delete(struct ap_mmap_t *mmap)
   {
       ap_status_t rv;
       if (mmap->area == -1)
  
  
  
  1.7       +1 -1      apache-2.0/src/lib/apr/mmap/beos/mmap_h.h
  
  Index: mmap_h.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/beos/mmap_h.h,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mmap_h.h	2000/03/31 08:36:10	1.6
  +++ mmap_h.h	2000/04/03 18:37:29	1.7
  @@ -68,7 +68,7 @@
   #include <string.h>
   #include <stdio.h>
   
  -struct mmap_t {
  +struct ap_mmap_t {
       ap_context_t *cntxt;
       area_id area;
       void *mm;
  
  
  
  1.13      +3 -3      apache-2.0/src/lib/apr/mmap/unix/mmap.c
  
  Index: mmap.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- mmap.c	2000/03/31 08:36:10	1.12
  +++ mmap.c	2000/04/03 18:37:29	1.13
  @@ -64,7 +64,7 @@
   
   ap_status_t mmap_cleanup(void *themmap)
   {
  -    struct mmap_t *mm = themmap;
  +    struct ap_mmap_t *mm = themmap;
       int rv;
       rv = munmap(mm->mm, mm->size);
   
  @@ -93,7 +93,7 @@
       if (file == NULL || file->buffered || file->filedes == -1)
           return APR_EBADF;
   
  -    (*new) = (struct mmap_t *)ap_palloc(cont, sizeof(struct mmap_t));
  +    (*new) = (struct ap_mmap_t *)ap_palloc(cont, sizeof(struct ap_mmap_t));
       
       ap_seek(file, APR_SET, &offset);
       mm = mmap(NULL, size, PROT_READ, MAP_SHARED, file->filedes ,0);
  @@ -117,7 +117,7 @@
    *    Remove a mmap'ed.
    * arg 1) The mmap'ed file.
    */
  -ap_status_t ap_mmap_delete(struct mmap_t *mmap)
  +ap_status_t ap_mmap_delete(struct ap_mmap_t *mmap)
   {
       ap_status_t rv;
   
  
  
  
  1.8       +1 -1      apache-2.0/src/lib/apr/mmap/unix/mmap_h.h
  
  Index: mmap_h.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/mmap/unix/mmap_h.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mmap_h.h	2000/03/31 08:36:10	1.7
  +++ mmap_h.h	2000/04/03 18:37:30	1.8
  @@ -84,7 +84,7 @@
   #endif
   /* End System Headers */
   
  -struct mmap_t {
  +struct ap_mmap_t {
       ap_context_t *cntxt;
       void *mm;
       size_t size;
  
  
  
  1.11      +3 -3      apache-2.0/src/lib/apr/network_io/beos/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/networkio.h,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- networkio.h	2000/03/31 08:36:11	1.10
  +++ networkio.h	2000/04/03 18:37:30	1.11
  @@ -85,7 +85,7 @@
   #define POLLHUP  16
   #define POLLNVAL 32
   
  -struct socket_t {
  +struct ap_socket_t {
       ap_context_t *cntxt;
       int socketdes;
       struct sockaddr_in *local_addr;
  @@ -95,9 +95,9 @@
       int connected;
   };
   
  -struct pollfd_t {
  +struct ap_pollfd_t {
       ap_context_t *cntxt;
  -    struct socket_t *sock;
  +    struct ap_socket_t *sock;
       fd_set *read;
       fd_set *write;
       fd_set *except;
  
  
  
  1.10      +11 -11    apache-2.0/src/lib/apr/network_io/beos/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/poll.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- poll.c	2000/03/31 08:36:11	1.9
  +++ poll.c	2000/04/03 18:37:30	1.10
  @@ -63,9 +63,9 @@
   /*  select for R4.5 of BeOS.  So here we use code that uses the write */
   /*  bits. */
       
  -ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num, ap_context_t *cont)
  +ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
   {
  -    (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) * num);
  +    (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t) * num);
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
  @@ -80,8 +80,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_add_poll_socket(struct pollfd_t *aprset,
  -                               struct socket_t *sock, ap_int16_t event)
  +ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset,
  +                               struct ap_socket_t *sock, ap_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_SET(sock->socketdes, aprset->read);
  @@ -98,7 +98,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_poll(struct pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
  +ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
   {
       int rv;
       struct timeval *thetime;
  @@ -127,7 +127,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct pollfd_t *aprset)
  +ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset)
   {
       ap_int16_t revents = 0;
       char data[256];
  @@ -172,8 +172,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset, 
  -                                  struct socket_t *sock, ap_int16_t events)
  +ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, 
  +                                  struct ap_socket_t *sock, ap_int16_t events)
   {
       if (events & APR_POLLIN) {
           FD_CLR(sock->socketdes, aprset->read);
  @@ -187,7 +187,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_clear_poll_sockets(struct pollfd_t *aprset, ap_int16_t event)
  +ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_ZERO(aprset->read);
  @@ -202,7 +202,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
  +ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
           return ap_get_userdata(data, key, pollfd->cntxt);
  @@ -213,7 +213,7 @@
       }
   }
   
  -ap_status_t ap_set_polldata(struct pollfd_t *pollfd, void *data, char *key,
  +ap_status_t ap_set_polldata(struct ap_pollfd_t *pollfd, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  
  
  
  1.6       +2 -2      apache-2.0/src/lib/apr/network_io/beos/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sendrecv.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- sendrecv.c	2000/03/31 08:36:11	1.5
  +++ sendrecv.c	2000/04/03 18:37:31	1.6
  @@ -54,7 +54,7 @@
   
   #include "networkio.h"
   
  -ap_status_t ap_send(struct socket_t *sock, const char *buf, ap_ssize_t *len)
  +ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len)
   {
       ssize_t rv;
   	
  @@ -99,7 +99,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_recv(struct socket_t *sock, char *buf, ap_ssize_t *len)
  +ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len)
   {
       ap_ssize_t rv;
      
  
  
  
  1.7       +10 -10    apache-2.0/src/lib/apr/network_io/beos/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockaddr.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- sockaddr.c	2000/03/31 08:36:11	1.6
  +++ sockaddr.c	2000/04/03 18:37:31	1.7
  @@ -54,7 +54,7 @@
   
   #include "networkio.h"
   
  -ap_status_t ap_set_local_port(struct socket_t *sock, ap_uint32_t port)
  +ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -63,7 +63,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_remote_port(struct socket_t *sock, ap_uint32_t port)
  +ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -72,7 +72,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_local_port(ap_uint32_t *port, struct socket_t *sock)
  +ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -81,7 +81,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_port(ap_uint32_t *port, struct socket_t *sock)
  +ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -90,7 +90,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_local_ipaddr(struct socket_t *sock, const char *addr)
  +ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
   
  @@ -113,7 +113,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_remote_ipaddr(struct socket_t *sock, const char *addr)
  +ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
   
  @@ -136,7 +136,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_local_ipaddr(char **addr, const struct socket_t *sock)
  +ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -146,7 +146,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_ipaddr(char **addr, const struct socket_t *sock)
  +ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -157,7 +157,7 @@
   }
   
   
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct socket_t *sock)
  +ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  @@ -167,7 +167,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct socket_t *sock)
  +ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct ap_socket_t *sock)
   {
       if (!sock) {
           return APR_EBADF;
  
  
  
  1.20      +15 -15    apache-2.0/src/lib/apr/network_io/beos/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockets.c,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- sockets.c	2000/03/31 08:36:11	1.19
  +++ sockets.c	2000/04/03 18:37:31	1.20
  @@ -56,7 +56,7 @@
   
   ap_status_t socket_cleanup(void *sock)
   {
  -    struct socket_t *thesocket = sock;
  +    struct ap_socket_t *thesocket = sock;
       if (closesocket(thesocket->socketdes) == 0) {
           thesocket->socketdes = -1;
           return APR_SUCCESS;
  @@ -66,9 +66,9 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
  +ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct socket_t *)ap_palloc(cont,sizeof(struct socket_t));
  +    (*new) = (struct ap_socket_t *)ap_palloc(cont,sizeof(struct ap_socket_t));
       
       if ((*new) == NULL){
           return APR_ENOMEM;
  @@ -100,18 +100,18 @@
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_shutdown(struct socket_t *thesocket, ap_shutdown_how_e how)
  +ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how)
   {
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_close_socket(struct socket_t *thesocket)
  +ap_status_t ap_close_socket(struct ap_socket_t *thesocket)
   {
       ap_kill_cleanup(thesocket->cntxt,thesocket,socket_cleanup);
       return socket_cleanup(thesocket);
   }
   
  -ap_status_t ap_bind(struct socket_t *sock) 
  +ap_status_t ap_bind(struct ap_socket_t *sock) 
   { 
       if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) 
           return errno; 
  @@ -119,7 +119,7 @@
           return APR_SUCCESS; 
   } 
    
  -ap_status_t ap_listen(struct socket_t *sock, ap_int32_t backlog) 
  +ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog) 
   { 
       if (listen(sock->socketdes, backlog) == -1) 
           return errno; 
  @@ -127,9 +127,9 @@
           return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock, struct context_t *connection_context) 
  +ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context) 
   { 
  -	(*new) = (struct socket_t *)ap_palloc(connection_context,
  +	(*new) = (struct ap_socket_t *)ap_palloc(connection_context,
   	                        sizeof(ap_socket_t)); 
   
       (*new)->cntxt = connection_context;
  @@ -157,7 +157,7 @@
       return APR_SUCCESS;
   } 
    
  -ap_status_t ap_connect(struct socket_t *sock, char *hostname) 
  +ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname) 
   { 
       struct hostent *hp; 
   
  @@ -186,7 +186,7 @@
       return APR_SUCCESS; 
   } 
   
  -ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t *sock)
  +ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *sock)
   {
       if (socket != NULL) {
           return ap_get_userdata(data, key, sock->cntxt);
  @@ -197,7 +197,7 @@
       }
   }
   
  -ap_status_t ap_set_socketdata(struct socket_t *sock, void *data, char *key,
  +ap_status_t ap_set_socketdata(struct ap_socket_t *sock, void *data, char *key,
                                 ap_status_t (*cleanup) (void *))
   {
       if (sock != NULL) {
  @@ -209,7 +209,7 @@
       }
   }
   
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct socket_t *sock)
  +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock)
   {
       if (sock == NULL) {
           return APR_ENOSOCKET;
  @@ -218,14 +218,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock, 
  +ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*sock) == NULL) {
  -        (*sock) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
  +        (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t));
           (*sock)->cntxt = cont;
       }
       (*sock)->socketdes = *thesock;
  
  
  
  1.13      +2 -2      apache-2.0/src/lib/apr/network_io/beos/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/beos/sockopt.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- sockopt.c	2000/03/31 08:36:11	1.12
  +++ sockopt.c	2000/04/03 18:37:31	1.13
  @@ -54,7 +54,7 @@
   
   #include "networkio.h"
   
  -ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
   {
       int one;
       if (on){
  @@ -92,7 +92,7 @@
   	}
   }
   
  -ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
  +ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock)
   {
       struct hostent *hptr;
       
  
  
  
  1.9       +2 -2      apache-2.0/src/lib/apr/network_io/os2/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/networkio.h,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- networkio.h	2000/03/31 08:36:12	1.8
  +++ networkio.h	2000/04/03 18:37:33	1.9
  @@ -61,7 +61,7 @@
   
   int os2errno( unsigned long oserror );
   
  -struct socket_t {
  +struct ap_socket_t {
       ap_context_t *cntxt;
       int socketdes;
       struct sockaddr_in *local_addr;
  @@ -71,7 +71,7 @@
       int nonblock;
   };
   
  -struct pollfd_t {
  +struct ap_pollfd_t {
       ap_context_t *cntxt;
       int *socket_list;
       int *r_socket_list;
  
  
  
  1.10      +8 -8      apache-2.0/src/lib/apr/network_io/os2/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/poll.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- poll.c	2000/03/31 08:36:12	1.9
  +++ poll.c	2000/04/03 18:37:33	1.10
  @@ -64,9 +64,9 @@
   
   /*  OS/2 doesn't have a poll function, implement using OS/2 style select */
    
  -ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num, ap_context_t *cont)
  +ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
   {
  -    *new = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t));
  +    *new = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t));
   
       if (*new == NULL) {
           return APR_ENOMEM;
  @@ -95,8 +95,8 @@
   
   
   
  -ap_status_t ap_add_poll_socket(struct pollfd_t *aprset, 
  -			       struct socket_t *sock, ap_int16_t events)
  +ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, 
  +			       struct ap_socket_t *sock, ap_int16_t events)
   {
       int i;
       
  @@ -126,7 +126,7 @@
   
   
   
  -ap_status_t ap_poll(struct pollfd_t *pollfdset, ap_int32_t *nsds, ap_int32_t timeout)
  +ap_status_t ap_poll(struct ap_pollfd_t *pollfdset, ap_int32_t *nsds, ap_int32_t timeout)
   {
       int i;
       int rv = 0;
  @@ -164,7 +164,7 @@
   
   
   
  -ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct pollfd_t *aprset)
  +ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset)
   {
       int i;
       
  @@ -186,8 +186,8 @@
   
   
   
  -ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset, 
  -                                  struct socket_t *sock, ap_int16_t events)
  +ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, 
  +                                  struct ap_socket_t *sock, ap_int16_t events)
   {
       int start, *count, pos;
   
  
  
  
  1.10      +2 -2      apache-2.0/src/lib/apr/network_io/os2/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sendrecv.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sendrecv.c	2000/03/31 08:36:12	1.9
  +++ sendrecv.c	2000/04/03 18:37:33	1.10
  @@ -59,7 +59,7 @@
   #include "apr_lib.h"
   #include <sys/time.h>
   
  -ap_status_t ap_send(struct socket_t *sock, const char *buf, ap_ssize_t *len)
  +ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len)
   {
       ssize_t rv;
       int fds, err = 0;
  @@ -98,7 +98,7 @@
   
   
   
  -ap_status_t ap_recv(struct socket_t *sock, char *buf, ap_ssize_t *len)
  +ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len)
   {
       ssize_t rv;
       int fds, err = 0;
  
  
  
  1.13      +16 -16    apache-2.0/src/lib/apr/network_io/os2/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockets.c,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- sockets.c	2000/03/31 08:36:12	1.12
  +++ sockets.c	2000/04/03 18:37:33	1.13
  @@ -68,7 +68,7 @@
   
   ap_status_t socket_cleanup(void *sock)
   {
  -    struct socket_t *thesocket = sock;
  +    struct ap_socket_t *thesocket = sock;
       if (soclose(thesocket->socketdes) == 0) {
           thesocket->socketdes = -1;
           return APR_SUCCESS;
  @@ -78,9 +78,9 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
  +ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
  +    (*new) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -112,7 +112,7 @@
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_shutdown(struct socket_t *thesocket, ap_shutdown_how_e how)
  +ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how)
   {
       if (shutdown(thesocket->socketdes, how) == 0) {
           return APR_SUCCESS;
  @@ -122,7 +122,7 @@
       }
   }
   
  -ap_status_t ap_close_socket(struct socket_t *thesocket)
  +ap_status_t ap_close_socket(struct ap_socket_t *thesocket)
   {
       ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
       return socket_cleanup(thesocket);
  @@ -131,7 +131,7 @@
   
   
   
  -ap_status_t ap_bind(struct socket_t *sock)
  +ap_status_t ap_bind(struct ap_socket_t *sock)
   {
       if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1)
           return os2errno(sock_errno());
  @@ -139,7 +139,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_listen(struct socket_t *sock, ap_int32_t backlog)
  +ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog)
   {
       if (listen(sock->socketdes, backlog) == -1)
           return os2errno(sock_errno());
  @@ -147,10 +147,10 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock, struct context_t *connection_context)
  +ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context)
   {
  -    (*new) = (struct socket_t *)ap_palloc(connection_context, 
  -                            sizeof(struct socket_t));
  +    (*new) = (struct ap_socket_t *)ap_palloc(connection_context, 
  +                            sizeof(struct ap_socket_t));
   
       (*new)->cntxt = connection_context;
       (*new)->remote_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt,
  @@ -170,7 +170,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_connect(struct socket_t *sock, char *hostname)
  +ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname)
   {
       struct hostent *hp;
   
  @@ -204,7 +204,7 @@
   
   
   
  -ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t *socket)
  +ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *socket)
   {
       if (socket != NULL) {
           return ap_get_userdata(data, key, socket->cntxt);
  @@ -217,7 +217,7 @@
   
   
   
  -ap_status_t ap_set_socketdata(struct socket_t *socket, void *data, char *key,
  +ap_status_t ap_set_socketdata(struct ap_socket_t *socket, void *data, char *key,
                                 ap_status_t (*cleanup) (void *))
   {
       if (socket != NULL) {
  @@ -229,7 +229,7 @@
       }
   }
   
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct socket_t *sock)
  +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock)
   {
       if (sock == NULL) {
           return APR_ENOSOCKET;
  @@ -240,13 +240,13 @@
   
   
   
  -ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont)
  +ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*sock) == NULL) {
  -        (*sock) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
  +        (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t));
           (*sock)->cntxt = cont;
       }
       (*sock)->socketdes = *thesock;
  
  
  
  1.10      +2 -2      apache-2.0/src/lib/apr/network_io/os2/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/os2/sockopt.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sockopt.c	2000/03/31 08:36:13	1.9
  +++ sockopt.c	2000/04/03 18:37:34	1.10
  @@ -66,7 +66,7 @@
   #include <sys/so_ioctl.h>
   
   
  -ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
   {
       int one;
       struct linger li;
  @@ -128,7 +128,7 @@
   
   
   
  -ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
  +ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock)
   {
       struct hostent *hptr;
   
  
  
  
  1.19      +2 -2      apache-2.0/src/lib/apr/network_io/unix/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/networkio.h,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- networkio.h	2000/04/03 03:34:59	1.18
  +++ networkio.h	2000/04/03 18:37:35	1.19
  @@ -105,7 +105,7 @@
   #endif
   /* End System Headers */
   
  -struct socket_t {
  +struct ap_socket_t {
       ap_context_t *cntxt;
       int socketdes;
       struct sockaddr_in *local_addr;
  @@ -117,7 +117,7 @@
   #endif
   };
   
  -struct pollfd_t {
  +struct ap_pollfd_t {
       ap_context_t *cntxt;
   #ifdef HAVE_POLL
       int *sock;
  
  
  
  1.20      +21 -21    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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- poll.c	2000/03/31 08:36:14	1.19
  +++ poll.c	2000/04/03 18:37:35	1.20
  @@ -64,10 +64,10 @@
    * arg 2) The number of socket descriptors to be polled.
    * arg 3) The context to operate on.
    */
  -ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num, ap_context_t *cont)
  +ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
   {
  -    (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t));
  -    (*new)->sock = ap_palloc(cont, sizeof(struct socket_t) * num);
  +    (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t));
  +    (*new)->sock = ap_palloc(cont, sizeof(struct ap_socket_t) * num);
       (*new)->events = ap_palloc(cont, sizeof(ap_int16_t) * num);
       (*new)->revents = ap_palloc(cont, sizeof(ap_int16_t) * num);
   
  @@ -130,8 +130,8 @@
    *            APR_POLLPRI   -- signal if prioirty data is availble to be read
    *            APR_POLLOUT   -- signal if write will not block
    */
  -ap_status_t ap_add_poll_socket(struct pollfd_t *aprset, 
  -			       struct socket_t *sock, ap_int16_t event)
  +ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, 
  +			       struct ap_socket_t *sock, ap_int16_t event)
   {
       int i = 0;
       
  @@ -160,7 +160,7 @@
    *        time.  A negative number means wait until a socket is signalled.
    * NOTE:  The number of sockets signalled is returned in the second argument. 
    */
  -ap_status_t ap_poll(struct pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
  +ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
   {
       int i;
       struct pollfd *pollset;
  @@ -206,7 +206,7 @@
    * arg 2) The socket we wish to get information about. 
    * arg 3) The poll structure we will be using. 
    */
  -ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct pollfd_t *aprset)
  +ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset)
   {
       int i = 0;
       
  @@ -231,8 +231,8 @@
    *            APR_POLLPRI   -- signal if prioirty data is availble to be read
    *            APR_POLLOUT   -- signal if write will not block
    */
  -ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset, 
  -                                  struct socket_t *sock, ap_int16_t events)
  +ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, 
  +                                  struct ap_socket_t *sock, ap_int16_t events)
   {
       ap_int16_t newevents;
       int i = 0;
  @@ -260,7 +260,7 @@
    *            APR_POLLPRI   -- signal if prioirty data is availble to be read
    *            APR_POLLOUT   -- signal if write will not block
    */
  -ap_status_t ap_clear_poll_sockets(struct pollfd_t *aprset, ap_int16_t events)
  +ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t events)
   {
       int i = 0;
       ap_int16_t newevents;
  @@ -278,9 +278,9 @@
   
   #else    /* Use select to mimic poll */
   
  -ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num, ap_context_t *cont)
  +ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
   {
  -    (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) * num);
  +    (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t) * num);
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
  @@ -295,8 +295,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_add_poll_socket(struct pollfd_t *aprset,
  -                               struct socket_t *sock, ap_int16_t event)
  +ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset,
  +                               struct ap_socket_t *sock, ap_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_SET(sock->socketdes, aprset->read);
  @@ -313,7 +313,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_poll(struct pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
  +ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
   {
       int rv;
       struct timeval *thetime;
  @@ -341,7 +341,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct pollfd_t *aprset)
  +ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset)
   {
       ap_int16_t revents = 0;
       char data[1];
  @@ -388,8 +388,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset, 
  -                                  struct socket_t *sock, ap_int16_t events)
  +ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, 
  +                                  struct ap_socket_t *sock, ap_int16_t events)
   {
       if (events & APR_POLLIN) {
           FD_CLR(sock->socketdes, aprset->read);
  @@ -403,7 +403,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_clear_poll_sockets(struct pollfd_t *aprset, ap_int16_t event)
  +ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_ZERO(aprset->read);
  @@ -427,7 +427,7 @@
    * arg 2) The key to use for retreiving data associated with a poll struct.
    * arg 3) The user data associated with the pollfd.
    */
  -ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
  +ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
           return ap_get_userdata(data, key, pollfd->cntxt);
  @@ -446,7 +446,7 @@
    * arg 2) The user data to associate with the pollfd.
   
    */
  -ap_status_t ap_set_polldata(struct pollfd_t *pollfd, void *data, char *key,
  +ap_status_t ap_set_polldata(struct ap_pollfd_t *pollfd, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  
  
  
  1.17      +4 -4      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.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- sendrecv.c	2000/03/31 08:36:14	1.16
  +++ sendrecv.c	2000/04/03 18:37:36	1.17
  @@ -67,7 +67,7 @@
   
   #endif /* HAVE_SENDFILE */
   
  -static ap_status_t wait_for_io_or_timeout(struct socket_t *sock, int for_read)
  +static ap_status_t wait_for_io_or_timeout(struct ap_socket_t *sock, int for_read)
   {
       struct timeval tv;
       fd_set fdset;
  @@ -104,7 +104,7 @@
    *        this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
    *        The number of bytes actually sent is stored in argument 3.
    */
  -ap_status_t ap_send(struct socket_t *sock, const char *buf, ap_ssize_t *len)
  +ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len)
   {
       ssize_t rv;
       
  @@ -142,7 +142,7 @@
    *        this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
    *        The number of bytes actually sent is stored in argument 3.
    */
  -ap_status_t ap_recv(struct socket_t *sock, char *buf, ap_ssize_t *len)
  +ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len)
   {
       ssize_t rv;
       
  @@ -182,7 +182,7 @@
    *        this behavior, use ap_setsocketopt with the APR_SO_TIMEOUT option.
    *        The number of bytes actually sent is stored in argument 3.
    */
  -ap_status_t ap_sendv(struct socket_t * sock, const struct iovec *vec,
  +ap_status_t ap_sendv(struct ap_socket_t * sock, const struct iovec *vec,
                        ap_int32_t nvec, ap_int32_t *len)
   {
       ssize_t rv;
  
  
  
  1.8       +10 -10    apache-2.0/src/lib/apr/network_io/unix/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockaddr.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- sockaddr.c	2000/03/31 08:36:14	1.7
  +++ sockaddr.c	2000/04/03 18:37:36	1.8
  @@ -63,7 +63,7 @@
    *        that this socket is going to use this port if possible.  If
    *        the port is already used, we won't find out about it here.
    */
  -ap_status_t ap_set_local_port(struct socket_t *sock, ap_uint32_t port)
  +ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port)
   {
       sock->local_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -79,7 +79,7 @@
    * NOTE:  This does not make a connection to the remote port, it is just 
    *        telling apr which port ap_connect() should attempt to connect to.
    */
  -ap_status_t ap_set_remote_port(struct socket_t *sock, ap_uint32_t port)
  +ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port)
   {
       sock->remote_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -93,7 +93,7 @@
    * arg 1) The local port this socket is associated with.
    * arg 2) The socket to enquire about.
    */
  -ap_status_t ap_get_local_port(ap_uint32_t *port, struct socket_t *sock)
  +ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock)
   {
       *port = ntohs(sock->local_addr->sin_port);
       return APR_SUCCESS;
  @@ -107,7 +107,7 @@
    * arg 1) The remote port this socket is associated with.
    * arg 2) The socket to enquire about.
    */
  -ap_status_t ap_get_remote_port(ap_uint32_t *port, struct socket_t *sock)
  +ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock)
   {
       *port = ntohs(sock->remote_addr->sin_port);
       return APR_SUCCESS;
  @@ -124,7 +124,7 @@
    * NOTE:  This does not bind the two together, it is just telling apr 
    *        that this socket is going to use this address if possible. 
    */
  -ap_status_t ap_set_local_ipaddr(struct socket_t *sock, const char *addr)
  +ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -153,7 +153,7 @@
    * NOTE:  This does not make a connection to the remote address, it is just
    *        telling apr which address ap_connect() should attempt to connect to.
    */
  -ap_status_t ap_set_remote_ipaddr(struct socket_t *sock, const char *addr)
  +ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -180,7 +180,7 @@
    * arg 1) The local IP address associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_local_ipaddr(char **addr, const struct socket_t *sock)
  +ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
       return APR_SUCCESS;
  @@ -194,7 +194,7 @@
    * arg 1) The remote IP address associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_remote_ipaddr(char **addr, const struct socket_t *sock)
  +ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
       return APR_SUCCESS;
  @@ -210,7 +210,7 @@
    * arg 1) The local name associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct socket_t *sock)
  +ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_t *sock)
   {
       *name = sock->local_addr;
       return APR_SUCCESS;
  @@ -225,7 +225,7 @@
    * arg 1) The remote name associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct socket_t *sock)
  +ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct ap_socket_t *sock)
   {
       *name = sock->remote_addr;
       return APR_SUCCESS;
  
  
  
  1.33      +16 -16    apache-2.0/src/lib/apr/network_io/unix/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockets.c,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- sockets.c	2000/04/03 03:34:59	1.32
  +++ sockets.c	2000/04/03 18:37:36	1.33
  @@ -57,7 +57,7 @@
   
   static ap_status_t socket_cleanup(void *sock)
   {
  -    struct socket_t *thesocket = sock;
  +    struct ap_socket_t *thesocket = sock;
       if (close(thesocket->socketdes) == 0) {
           thesocket->socketdes = -1;
           return APR_SUCCESS;
  @@ -73,9 +73,9 @@
    * arg 1) The new socket that has been setup. 
    * arg 2) The context to use
    */
  -ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
  +ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
  +    (*new) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -117,7 +117,7 @@
    * NOTE:  This does not actually close the socket descriptor, it just
    *        controls which calls are still valid on the socket.
    */
  -ap_status_t ap_shutdown(struct socket_t *thesocket, ap_shutdown_how_e how)
  +ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how)
   {
       if (shutdown(thesocket->socketdes, how) == 0) {
           return APR_SUCCESS;
  @@ -132,7 +132,7 @@
    *    Close a tcp socket.
    * arg 1) The socket to close 
    */
  -ap_status_t ap_close_socket(struct socket_t *thesocket)
  +ap_status_t ap_close_socket(struct ap_socket_t *thesocket)
   {
       ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
       return socket_cleanup(thesocket);
  @@ -145,7 +145,7 @@
    * NOTE:  This is where we will find out if there is any other process
    *        using the selected port.
    */
  -ap_status_t ap_bind(struct socket_t *sock)
  +ap_status_t ap_bind(struct ap_socket_t *sock)
   {
       if (bind(sock->socketdes, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1)
           return errno;
  @@ -161,7 +161,7 @@
    *        listen queue.  If this value is less than zero, the listen
    *        queue size is set to zero.  
    */
  -ap_status_t ap_listen(struct socket_t *sock, ap_int32_t backlog)
  +ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog)
   {
       if (listen(sock->socketdes, backlog) == -1)
           return errno;
  @@ -179,10 +179,10 @@
    * arg 2) The socket we are listening on.
    * arg 3) The context for the new socket.
    */
  -ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock, struct context_t *connection_context)
  +ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context)
   {
  -    (*new) = (struct socket_t *)ap_palloc(connection_context, 
  -                            sizeof(struct socket_t));
  +    (*new) = (struct ap_socket_t *)ap_palloc(connection_context, 
  +                            sizeof(struct ap_socket_t));
   
       (*new)->cntxt = connection_context;
       (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt, 
  @@ -220,7 +220,7 @@
    *        APR assumes that the sockaddr_in in the apr_socket is completely
    *        filled out.
    */
  -ap_status_t ap_connect(struct socket_t *sock, char *hostname)
  +ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname)
   {
       struct hostent *hp;
   
  @@ -259,7 +259,7 @@
    * arg 1) The currently open socket.
    * arg 2) The user data associated with the socket.
    */
  -ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t *sock)
  +ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *sock)
   {
       if (sock != NULL) {
           return ap_get_userdata(data, key, sock->cntxt);
  @@ -279,7 +279,7 @@
    * arg 3) The key to associate with the data.
    * arg 4) The cleanup to call when the socket is destroyed.
    */
  -ap_status_t ap_set_socketdata(struct socket_t *sock, void *data, char *key,
  +ap_status_t ap_set_socketdata(struct ap_socket_t *sock, void *data, char *key,
                                 ap_status_t (*cleanup) (void *))
   {
       if (sock != NULL) {
  @@ -297,7 +297,7 @@
    * arg 1) The socket to convert.
    * arg 2) The os specifc equivelant of the apr socket..
    */
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct socket_t *sock)
  +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock)
   {
       if (sock == NULL) {
           return APR_ENOSOCKET;
  @@ -314,14 +314,14 @@
    * arg 2) The socket to convert to.
    * arg 3) The socket we are converting to an apr type.
    */
  -ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock, 
  +ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*sock) == NULL) {
  -        (*sock) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
  +        (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t));
           (*sock)->cntxt = cont;
           (*sock)->local_addr = (struct sockaddr_in *)ap_palloc((*sock)->cntxt,
                                sizeof(struct sockaddr_in));
  
  
  
  1.19      +2 -2      apache-2.0/src/lib/apr/network_io/unix/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/unix/sockopt.c,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- sockopt.c	2000/04/03 03:34:59	1.18
  +++ sockopt.c	2000/04/03 18:37:36	1.19
  @@ -114,7 +114,7 @@
    *            APR_SO_SNDBUF     --  Set the SendBufferSize
    * arg 3) Are we turning the option on or off.
    */
  -ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
   {
       int one;
       struct linger li;
  @@ -193,7 +193,7 @@
    * arg 1) A buffer to store the hostname in.
    * arg 2) The socket to examine.
    */
  -ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
  +ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock)
   {
       struct hostent *hptr;
       
  
  
  
  1.8       +2 -2      apache-2.0/src/lib/apr/network_io/win32/networkio.h
  
  Index: networkio.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/networkio.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- networkio.h	2000/04/03 04:52:13	1.7
  +++ networkio.h	2000/04/03 18:37:38	1.8
  @@ -58,7 +58,7 @@
   #include "apr_network_io.h"
   #include "apr_general.h"
   
  -struct socket_t {
  +struct ap_socket_t {
       ap_context_t *cntxt;
       SOCKET sock;
       struct sockaddr_in *local_addr;
  @@ -67,7 +67,7 @@
       int timeout;
   };
   
  -struct pollfd_t {
  +struct ap_pollfd_t {
       ap_context_t *cntxt;
       fd_set *read;
       int numread;
  
  
  
  1.10      +11 -11    apache-2.0/src/lib/apr/network_io/win32/poll.c
  
  Index: poll.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/poll.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- poll.c	2000/03/31 08:36:16	1.9
  +++ poll.c	2000/04/03 18:37:39	1.10
  @@ -61,9 +61,9 @@
   #include <time.h>
   
   
  -ap_status_t ap_setup_poll(struct pollfd_t **new, ap_int32_t num, ap_context_t *cont)
  +ap_status_t ap_setup_poll(struct ap_pollfd_t **new, ap_int32_t num, ap_context_t *cont)
   {
  -    (*new) = (struct pollfd_t *)ap_palloc(cont, sizeof(struct pollfd_t) * num);
  +    (*new) = (struct ap_pollfd_t *)ap_palloc(cont, sizeof(struct ap_pollfd_t) * num);
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
  @@ -80,8 +80,8 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_add_poll_socket(struct pollfd_t *aprset, 
  -			       struct socket_t *sock, ap_int16_t event)
  +ap_status_t ap_add_poll_socket(struct ap_pollfd_t *aprset, 
  +			       struct ap_socket_t *sock, ap_int16_t event)
   {
       if (event & APR_POLLIN) {
           FD_SET(sock->sock, aprset->read);
  @@ -98,7 +98,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_poll(struct pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
  +ap_status_t ap_poll(struct ap_pollfd_t *aprset, ap_int32_t *nsds, ap_int32_t timeout)
   {
       int rv;
       struct timeval *thetime;
  @@ -142,7 +142,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_revents(ap_int16_t *event, struct socket_t *sock, struct pollfd_t *aprset)
  +ap_status_t ap_get_revents(ap_int16_t *event, struct ap_socket_t *sock, struct ap_pollfd_t *aprset)
   {
       ap_int16_t revents = 0;
       WSABUF data;
  @@ -195,7 +195,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_polldata(struct pollfd_t *pollfd, char *key, void *data)
  +ap_status_t ap_get_polldata(struct ap_pollfd_t *pollfd, char *key, void *data)
   {
       if (pollfd != NULL) {
           return ap_get_userdata(data, key, pollfd->cntxt);
  @@ -206,7 +206,7 @@
       }
   }
   
  -ap_status_t ap_set_polldata(struct pollfd_t *pollfd, void *data, char *key,
  +ap_status_t ap_set_polldata(struct ap_pollfd_t *pollfd, void *data, char *key,
                               ap_status_t (*cleanup) (void *))
   {
       if (pollfd != NULL) {
  @@ -218,8 +218,8 @@
       }
   }
   
  -ap_status_t ap_remove_poll_socket(struct pollfd_t *aprset, 
  -                                  struct socket_t *sock, ap_int16_t events)
  +ap_status_t ap_remove_poll_socket(struct ap_pollfd_t *aprset, 
  +                                  struct ap_socket_t *sock, ap_int16_t events)
   {
       if (events & APR_POLLIN) {
           FD_CLR(sock->sock, aprset->read);
  @@ -236,7 +236,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_clear_poll_sockets(struct pollfd_t *aprset, ap_int16_t events)
  +ap_status_t ap_clear_poll_sockets(struct ap_pollfd_t *aprset, ap_int16_t events)
   {
       if (events & APR_POLLIN) {
           FD_ZERO(aprset->read);
  
  
  
  1.12      +3 -3      apache-2.0/src/lib/apr/network_io/win32/sendrecv.c
  
  Index: sendrecv.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sendrecv.c,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- sendrecv.c	2000/03/31 08:36:16	1.11
  +++ sendrecv.c	2000/04/03 18:37:39	1.12
  @@ -60,7 +60,7 @@
   #include "fileio.h"
   #include <time.h>
   
  -ap_status_t ap_send(struct socket_t *sock, const char *buf, ap_ssize_t *len)
  +ap_status_t ap_send(struct ap_socket_t *sock, const char *buf, ap_ssize_t *len)
   {
       ap_ssize_t rv;
       WSABUF wsaData;
  @@ -81,7 +81,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_recv(struct socket_t *sock, char *buf, ap_ssize_t *len) 
  +ap_status_t ap_recv(struct ap_socket_t *sock, char *buf, ap_ssize_t *len) 
   {
       ap_ssize_t rv;
       WSABUF wsaData;
  @@ -102,7 +102,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_sendv(struct socket_t *sock, const struct iovec *vec,
  +ap_status_t ap_sendv(struct ap_socket_t *sock, const struct iovec *vec,
                        ap_int32_t nvec, ap_int32_t *nbytes)
   {
       ap_ssize_t rv;
  
  
  
  1.4       +10 -10    apache-2.0/src/lib/apr/network_io/win32/sockaddr.c
  
  Index: sockaddr.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockaddr.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- sockaddr.c	2000/03/31 08:36:16	1.3
  +++ sockaddr.c	2000/04/03 18:37:39	1.4
  @@ -68,7 +68,7 @@
    *        that this socket is going to use this port if possible.  If
    *        the port is already used, we won't find out about it here.
    */
  -ap_status_t ap_set_local_port(struct socket_t *sock, ap_uint32_t port)
  +ap_status_t ap_set_local_port(struct ap_socket_t *sock, ap_uint32_t port)
   {
       sock->local_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -84,7 +84,7 @@
    * NOTE:  This does not make a connection to the remote port, it is just 
    *        telling apr which port ap_connect() should attempt to connect to.
    */
  -ap_status_t ap_set_remote_port(struct socket_t *sock, ap_uint32_t port)
  +ap_status_t ap_set_remote_port(struct ap_socket_t *sock, ap_uint32_t port)
   {
       sock->remote_addr->sin_port = htons((short)port);
       return APR_SUCCESS;
  @@ -98,7 +98,7 @@
    * arg 1) The local port this socket is associated with.
    * arg 2) The socket to enquire about.
    */
  -ap_status_t ap_get_local_port(ap_uint32_t *port, struct socket_t *sock)
  +ap_status_t ap_get_local_port(ap_uint32_t *port, struct ap_socket_t *sock)
   {
       *port = ntohs(sock->local_addr->sin_port);
       return APR_SUCCESS;
  @@ -112,7 +112,7 @@
    * arg 1) The remote port this socket is associated with.
    * arg 2) The socket to enquire about.
    */
  -ap_status_t ap_get_remote_port(ap_uint32_t *port, struct socket_t *sock)
  +ap_status_t ap_get_remote_port(ap_uint32_t *port, struct ap_socket_t *sock)
   {
       *port = ntohs(sock->remote_addr->sin_port);
       return APR_SUCCESS;
  @@ -129,7 +129,7 @@
    * NOTE:  This does not bind the two together, it is just telling apr 
    *        that this socket is going to use this address if possible. 
    */
  -ap_status_t ap_set_local_ipaddr(struct socket_t *sock, const char *addr)
  +ap_status_t ap_set_local_ipaddr(struct ap_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -156,7 +156,7 @@
    * NOTE:  This does not make a connection to the remote address, it is just
    *        telling apr which address ap_connect() should attempt to connect to.
    */
  -ap_status_t ap_set_remote_ipaddr(struct socket_t *sock, const char *addr)
  +ap_status_t ap_set_remote_ipaddr(struct ap_socket_t *sock, const char *addr)
   {
       u_long ipaddr;
       
  @@ -181,7 +181,7 @@
    * arg 1) The local IP address associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_local_ipaddr(char **addr, const struct socket_t *sock)
  +ap_status_t ap_get_local_ipaddr(char **addr, const struct ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->local_addr->sin_addr));
       return APR_SUCCESS;
  @@ -195,7 +195,7 @@
    * arg 1) The remote IP address associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_remote_ipaddr(char **addr, const struct socket_t *sock)
  +ap_status_t ap_get_remote_ipaddr(char **addr, const struct ap_socket_t *sock)
   {
       *addr = ap_pstrdup(sock->cntxt, inet_ntoa(sock->remote_addr->sin_addr));
       return APR_SUCCESS;
  @@ -208,7 +208,7 @@
    * arg 1) The local name associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct socket_t *sock)
  +ap_status_t ap_get_local_name(struct sockaddr_in **name, const struct ap_socket_t *sock)
   {
       *name = sock->local_addr;
       return APR_SUCCESS;
  @@ -222,7 +222,7 @@
    * arg 1) The remote name associated with the socket.
    * arg 2) The socket to use 
    */
  -ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct socket_t *sock)
  +ap_status_t ap_get_remote_name(struct sockaddr_in **name, const struct ap_socket_t *sock)
   {
       *name = sock->remote_addr;
       return APR_SUCCESS;
  
  
  
  1.22      +16 -16    apache-2.0/src/lib/apr/network_io/win32/sockets.c
  
  Index: sockets.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockets.c,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -r1.21 -r1.22
  --- sockets.c	2000/04/03 04:52:13	1.21
  +++ sockets.c	2000/04/03 18:37:40	1.22
  @@ -64,7 +64,7 @@
   
   static ap_status_t socket_cleanup(void *sock)
   {
  -    struct socket_t *thesocket = sock;
  +    struct ap_socket_t *thesocket = sock;
       if (closesocket(thesocket->sock) != SOCKET_ERROR) {
           thesocket->sock = INVALID_SOCKET;
           return APR_SUCCESS;
  @@ -74,9 +74,9 @@
       }
   }
   
  -ap_status_t ap_create_tcp_socket(struct socket_t **new, ap_context_t *cont)
  +ap_status_t ap_create_tcp_socket(struct ap_socket_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
  +    (*new) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -109,7 +109,7 @@
       return APR_SUCCESS;
   } 
   
  -ap_status_t ap_shutdown(struct socket_t *thesocket, ap_shutdown_how_e how)
  +ap_status_t ap_shutdown(struct ap_socket_t *thesocket, ap_shutdown_how_e how)
   {
       int winhow;
   
  @@ -135,13 +135,13 @@
       }
   }
   
  -ap_status_t ap_close_socket(struct socket_t *thesocket)
  +ap_status_t ap_close_socket(struct ap_socket_t *thesocket)
   {
       ap_kill_cleanup(thesocket->cntxt, thesocket, socket_cleanup);
       return socket_cleanup(thesocket);
   }
   
  -ap_status_t ap_bind(struct socket_t *sock)
  +ap_status_t ap_bind(struct ap_socket_t *sock)
   {
       if (bind(sock->sock, (struct sockaddr *)sock->local_addr, sock->addr_len) == -1) {
           return errno;
  @@ -150,7 +150,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_listen(struct socket_t *sock, ap_int32_t backlog)
  +ap_status_t ap_listen(struct ap_socket_t *sock, ap_int32_t backlog)
   {
       if (listen(sock->sock, backlog) == SOCKET_ERROR)
           return APR_EEXIST;
  @@ -158,10 +158,10 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_accept(struct socket_t **new, const struct socket_t *sock, struct context_t *connection_context)
  +ap_status_t ap_accept(struct ap_socket_t **new, const struct ap_socket_t *sock, struct ap_context_t *connection_context)
   {
  -    (*new) = (struct socket_t *)ap_palloc(connection_context, 
  -                            sizeof(struct socket_t));
  +    (*new) = (struct ap_socket_t *)ap_palloc(connection_context, 
  +                            sizeof(struct ap_socket_t));
   
       (*new)->cntxt = connection_context;
       (*new)->local_addr = (struct sockaddr_in *)ap_palloc((*new)->cntxt, 
  @@ -184,7 +184,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_connect(struct socket_t *sock, char *hostname)
  +ap_status_t ap_connect(struct ap_socket_t *sock, char *hostname)
   {
       struct hostent *hp;
       int lasterror;
  @@ -226,7 +226,7 @@
       }
   }
   
  -ap_status_t ap_get_socketdata(void **data, char *key, struct socket_t *socket)
  +ap_status_t ap_get_socketdata(void **data, char *key, struct ap_socket_t *socket)
   {
       if (socket != NULL) {
           return ap_get_userdata(data, key, socket->cntxt);
  @@ -237,7 +237,7 @@
       }
   }
   
  -ap_status_t ap_set_socketdata(struct socket_t *socket, void *data, char *key, 
  +ap_status_t ap_set_socketdata(struct ap_socket_t *socket, void *data, char *key, 
                                 ap_status_t (*cleanup) (void *))
   {
       if (socket != NULL) {
  @@ -249,7 +249,7 @@
       }
   }
   
  -ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct socket_t *sock)
  +ap_status_t ap_get_os_sock(ap_os_sock_t *thesock, struct ap_socket_t *sock)
   {
       if (sock == NULL) {
           return APR_ENOSOCKET;
  @@ -258,14 +258,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_sock(struct socket_t **sock, ap_os_sock_t *thesock, 
  +ap_status_t ap_put_os_sock(struct ap_socket_t **sock, ap_os_sock_t *thesock, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*sock) == NULL) {
  -        (*sock) = (struct socket_t *)ap_palloc(cont, sizeof(struct socket_t));
  +        (*sock) = (struct ap_socket_t *)ap_palloc(cont, sizeof(struct ap_socket_t));
           (*sock)->cntxt = cont;
           (*sock)->local_addr = (struct sockaddr_in *)ap_palloc((*sock)->cntxt,
                                sizeof(struct sockaddr_in));
  
  
  
  1.10      +2 -2      apache-2.0/src/lib/apr/network_io/win32/sockopt.c
  
  Index: sockopt.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/network_io/win32/sockopt.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- sockopt.c	2000/04/03 04:52:13	1.9
  +++ sockopt.c	2000/04/03 18:37:40	1.10
  @@ -79,7 +79,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setsocketopt(struct socket_t *sock, ap_int32_t opt, ap_int32_t on)
  +ap_status_t ap_setsocketopt(struct ap_socket_t *sock, ap_int32_t opt, ap_int32_t on)
   {
       int one;
       struct linger li;
  @@ -141,7 +141,7 @@
           return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_remote_hostname(char **name, struct socket_t *sock)
  +ap_status_t ap_get_remote_hostname(char **name, struct ap_socket_t *sock)
   {
       struct hostent *hptr;
   
  
  
  
  1.19      +21 -21    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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- proc.c	2000/03/31 08:36:23	1.18
  +++ proc.c	2000/04/03 18:37:42	1.19
  @@ -60,10 +60,10 @@
   	int err;
   };
   
  -ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
  +ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct procattr_t *)ap_palloc(cont, 
  -              sizeof(struct procattr_t));
  +    (*new) = (struct ap_procattr_t *)ap_palloc(cont, 
  +              sizeof(struct ap_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -81,7 +81,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in, 
  +ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, 
                                    ap_int32_t out, ap_int32_t err)
   {
       ap_status_t status;
  @@ -133,7 +133,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_dir(struct procattr_t *attr, 
  +ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, 
                                    const char *dir) 
   {
       char * cwd;
  @@ -153,24 +153,24 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_setprocattr_cmdtype(struct procattr_t *attr,
  +ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr,
                                        ap_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_detach(struct procattr_t *attr, ap_int32_t detach) 
  +ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t detach) 
   {
       attr->detached = detach;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_fork(struct proc_t **proc, ap_context_t *cont)
  +ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont)
   {
       int pid;
       
  -    (*proc) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +    (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
   
       if ((pid = fork()) < 0) {
           return errno;
  @@ -186,9 +186,9 @@
   }
   
   
  -ap_status_t ap_create_process(struct proc_t **new, const char *progname, 
  +ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, 
                                 char *const args[], char **env, 
  -                              struct procattr_t *attr, ap_context_t *cont)
  +                              struct ap_procattr_t *attr, ap_context_t *cont)
   {
       int i=0,nargs=0;
       char **newargs = NULL;
  @@ -198,7 +198,7 @@
       struct send_pipe *sp;        
   	char * dir = NULL;
   	    
  -    (*new) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +    (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
   	sp = (struct send_pipe *)ap_palloc(cont, sizeof(struct send_pipe));
   
       if ((*new) == NULL){
  @@ -270,25 +270,25 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_in; 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_out;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_wait_proc(struct proc_t *proc, 
  +ap_status_t ap_wait_proc(struct ap_proc_t *proc, 
                              ap_wait_how_e wait)
   {
       status_t exitval;
  @@ -313,7 +313,7 @@
       return APR_CHILD_NOTDONE;
   } 
   
  -ap_status_t ap_setprocattr_childin(struct procattr_t *attr, ap_file_t *child_in,
  +ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in,
                                      ap_file_t *parent_in)
   {
       if (attr->child_in == NULL && attr->parent_in == NULL)
  @@ -328,7 +328,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_childout(struct procattr_t *attr, ap_file_t *child_out,
  +ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child_out,
                                       ap_file_t *parent_out)
   {
       if (attr->child_out == NULL && attr->parent_out == NULL)
  @@ -343,7 +343,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_childerr(struct procattr_t *attr, ap_file_t *child_err,
  +ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child_err,
                                      ap_file_t *parent_err)
   {
       if (attr->child_err == NULL && attr->parent_err == NULL)
  @@ -367,14 +367,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_proc(struct proc_t **proc, ap_os_proc_t *theproc, 
  +ap_status_t ap_put_os_proc(struct ap_proc_t **proc, ap_os_proc_t *theproc, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*proc) == NULL) {
  -        (*proc) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +        (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
           (*proc)->cntxt = cont;
       }
       (*proc)->tid = *theproc;
  
  
  
  1.10      +4 -4      apache-2.0/src/lib/apr/threadproc/beos/procsup.c
  
  Index: procsup.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/procsup.c,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- procsup.c	2000/03/31 08:36:23	1.9
  +++ procsup.c	2000/04/03 18:37:42	1.10
  @@ -54,11 +54,11 @@
   
   #include "threadproc.h"
   
  -ap_status_t ap_detach(struct proc_t **new, ap_context_t *cont)
  +ap_status_t ap_detach(struct ap_proc_t **new, ap_context_t *cont)
   {
       int x;
   
  -    (*new) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +    (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
       (*new)->cntxt = cont;
       (*new)->attr = NULL;
   
  @@ -89,7 +89,7 @@
       }
   }
   
  -ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
  +ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc)
   {
       if (proc != NULL) {
           return ap_get_userdata(data, key, proc->cntxt);
  @@ -102,7 +102,7 @@
   
   ap_status_t ap_set_procdata(void *data, char *key, 
                               ap_status_t (*cleanup) (void *), 
  -                            struct proc_t *proc)
  +                            struct ap_proc_t *proc)
   {
       if (proc != NULL) {
           return ap_set_userdata(data, key, cleanup, proc->cntxt);
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/threadproc/beos/signals.c
  
  Index: signals.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/signals.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- signals.c	2000/03/31 08:36:23	1.5
  +++ signals.c	2000/04/03 18:37:43	1.6
  @@ -54,7 +54,7 @@
   
   #include "threadproc.h"
   
  -ap_status_t ap_kill(struct proc_t *proc, int signal)
  +ap_status_t ap_kill(struct ap_proc_t *proc, int signal)
   {
   /* I've changed this to use kill_thread instead of kill() as kill()
      tended to kill the whole server! This isn't as good as it ignores
  
  
  
  1.8       +7 -7      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- thread.c	2000/03/31 08:36:23	1.7
  +++ thread.c	2000/04/03 18:37:43	1.8
  @@ -54,12 +54,12 @@
   
   #include "threadproc.h"
   
  -ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
  +ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont)
   {
       ap_status_t stat;
     
  -    (*new) = (struct threadattr_t *)ap_palloc(cont, 
  -              sizeof(struct threadattr_t));
  +    (*new) = (struct ap_threadattr_t *)ap_palloc(cont, 
  +              sizeof(struct ap_threadattr_t));
       (*new)->attr = (int32)ap_palloc(cont, 
                       sizeof(int32));
   
  @@ -73,7 +73,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setthreadattr_detach(struct threadattr_t *attr, ap_int32_t on)
  +ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on)
   {
   	if (on == 1){
   		attr->detached = 1;
  @@ -83,7 +83,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_getthreadattr_detach(struct threadattr_t *attr)
  +ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr)
   {
   	if (attr->detached == 1){
   		return APR_DETACH;
  @@ -91,14 +91,14 @@
   	return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr,
  +ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr,
                                ap_thread_start_t func, void *data,
                                ap_context_t *cont)
   {
       int32 temp;
       ap_status_t stat;
       
  -    (*new) = (struct thread_t *)ap_palloc(cont, sizeof(struct thread_t));
  +    (*new) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t));
       if ((*new) == NULL) {
           return APR_ENOMEM;
       }
  
  
  
  1.6       +1 -1      apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadcancel.c,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadcancel.c	2000/03/31 08:36:23	1.5
  +++ threadcancel.c	2000/04/03 18:37:44	1.6
  @@ -55,7 +55,7 @@
   #include "threadproc.h"
   
   
  -ap_status_t ap_cancel_thread(struct thread_t *thd)
  +ap_status_t ap_cancel_thread(struct ap_thread_t *thd)
   {
       if (kill_thread(thd->td) == 0) {
           return APR_SUCCESS;
  
  
  
  1.7       +5 -5      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- threadpriv.c	2000/03/31 08:36:23	1.6
  +++ threadpriv.c	2000/04/03 18:37:44	1.7
  @@ -58,10 +58,10 @@
   static struct beos_private_data *beos_data[BEOS_MAX_DATAKEYS];
   static sem_id lock;
   
  -ap_status_t ap_create_thread_private(struct threadkey_t **key,
  +ap_status_t ap_create_thread_private(struct ap_threadkey_t **key,
                                   void (*dest)(void *), ap_context_t *cont)
   {
  -    (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
  +    (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t));
       if ((*key) == NULL) {
           return APR_ENOMEM;
       }
  @@ -82,7 +82,7 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
  +ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key)
   {
   	thread_id tid;
   	int i, index=0;
  @@ -114,7 +114,7 @@
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
  +ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key)
   {
   	thread_id tid;
   	int i,index = 0, ret;
  @@ -169,7 +169,7 @@
   	return APR_ENOMEM;
   }
   
  -ap_status_t ap_delete_thread_private(struct threadkey_t *key)
  +ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key)
   {
   	if (key->key < BEOS_MAX_DATAKEYS){
   		acquire_sem(key_table[key->key].lock);
  
  
  
  1.8       +6 -6      apache-2.0/src/lib/apr/threadproc/beos/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/beos/threadproc.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- threadproc.h	2000/03/31 08:36:23	1.7
  +++ threadproc.h	2000/04/03 18:37:44	1.8
  @@ -77,19 +77,19 @@
   
   #define BEOS_MAX_DATAKEYS	128
   
  -struct thread_t {
  +struct ap_thread_t {
       ap_context_t *cntxt;
       thread_id td;
   };
   
  -struct threadattr_t {
  +struct ap_threadattr_t {
       ap_context_t *cntxt;
       int32 attr;
       int detached;
       int joinable;
   };
   
  -struct threadkey_t {
  +struct ap_threadkey_t {
       ap_context_t *cntxt;
   	int32  key;
   };
  @@ -108,7 +108,7 @@
   	void (* destructor) ();
   };
   
  -struct procattr_t {
  +struct ap_procattr_t {
       ap_context_t *cntxt;
       ap_file_t *parent_in;
       ap_file_t *child_in;
  @@ -121,11 +121,11 @@
       ap_int32_t detached;
   };
   
  -struct proc_t {
  +struct ap_proc_t {
       ap_context_t *cntxt;
       pid_t pid;
       thread_id tid;
  -    struct procattr_t *attr;
  +    struct ap_procattr_t *attr;
   };
   
   /* we need a structure to pass off to the thread that will run any
  
  
  
  1.16      +17 -17    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.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- proc.c	2000/03/31 08:36:25	1.15
  +++ proc.c	2000/04/03 18:37:46	1.16
  @@ -71,10 +71,10 @@
   #include <stdlib.h>
   #include <os2.h>
   
  -ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
  +ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct procattr_t *)ap_palloc(cont, 
  -              sizeof(struct procattr_t));
  +    (*new) = (struct ap_procattr_t *)ap_palloc(cont, 
  +              sizeof(struct ap_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -92,7 +92,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in, 
  +ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, 
                                    ap_int32_t out, ap_int32_t err)
   {
       ap_status_t stat;
  @@ -117,7 +117,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_dir(struct procattr_t *attr, const char *dir)
  +ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, const char *dir)
   {
       attr->currdir = ap_pstrdup(attr->cntxt, dir);
       if (attr->currdir) {
  @@ -126,24 +126,24 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_setprocattr_cmdtype(struct procattr_t *attr,
  +ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr,
                                        ap_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_detach(struct procattr_t *attr, ap_int32_t detach) 
  +ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t detach) 
   {
       attr->detached = detach;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_fork(struct proc_t **proc, ap_context_t *cont)
  +ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont)
   {
       int pid;
       
  -    (*proc) = ap_palloc(cont, sizeof(struct proc_t));
  +    (*proc) = ap_palloc(cont, sizeof(struct ap_proc_t));
   
       if ((pid = fork()) < 0) {
           return errno;
  @@ -165,7 +165,7 @@
   /* quotes in the string are doubled up.
    * Used to escape quotes in args passed to OS/2's cmd.exe
    */
  -static char *double_quotes(struct context_t *cntxt, char *str)
  +static char *double_quotes(struct ap_context_t *cntxt, char *str)
   {
       int num_quotes = 0;
       int len = 0;
  @@ -190,9 +190,9 @@
   
   
   
  -ap_status_t ap_create_process(struct proc_t **new, const char *progname,
  +ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname,
                                 char *const args[], char **env,
  -                              struct procattr_t *attr, ap_context_t *cont)
  +                              struct ap_procattr_t *attr, ap_context_t *cont)
   {
       int i, arg, numargs, cmdlen;
       ap_status_t status;
  @@ -208,7 +208,7 @@
       char *env_block, *env_block_pos;
       RESULTCODES rescodes;
   
  -    (*new) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +    (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -412,25 +412,25 @@
   
   
   
  -ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_in;
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_out; 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_wait_proc(struct proc_t *proc, 
  +ap_status_t ap_wait_proc(struct ap_proc_t *proc, 
                              ap_wait_how_e wait)
   {
       RESULTCODES codes;
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- signals.c	2000/03/31 08:36:25	1.3
  +++ signals.c	2000/04/03 18:37:46	1.4
  @@ -63,7 +63,7 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_kill(struct proc_t *proc, int signal)
  +ap_status_t ap_kill(struct ap_proc_t *proc, int signal)
   {
   /* SIGTERM's don't work too well in OS/2 (only affects other EMX programs).
      CGIs may not be, esp. REXX scripts, so use a native call instead */
  
  
  
  1.8       +9 -9      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- thread.c	2000/03/31 08:36:25	1.7
  +++ thread.c	2000/04/03 18:37:46	1.8
  @@ -61,9 +61,9 @@
   #define INCL_DOS
   #include <os2.h>
   
  -ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
  +ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct threadattr_t *)ap_palloc(cont, sizeof(struct threadattr_t));
  +    (*new) = (struct ap_threadattr_t *)ap_palloc(cont, sizeof(struct ap_threadattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -76,7 +76,7 @@
   
   
   
  -ap_status_t ap_setthreadattr_detach(struct threadattr_t *attr, ap_int32_t on)
  +ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on)
   {
       attr->attr |= APR_THREADATTR_DETACHED;
       return APR_SUCCESS;
  @@ -84,7 +84,7 @@
   
   
   
  -ap_status_t ap_getthreadattr_detach(struct threadattr_t *attr)
  +ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr)
   {
       return (attr->attr & APR_THREADATTR_DETACHED) ? APR_DETACH : APR_NOTDETACH;
   }
  @@ -93,20 +93,20 @@
   
   static void ap_thread_begin(void *arg)
   {
  -  struct thread_t *thread = (struct thread_t *)arg;
  +  struct ap_thread_t *thread = (struct ap_thread_t *)arg;
     thread->rv = thread->func(thread->data);
   }
   
   
   
  -ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
  +ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
                                ap_context_t *cont)
   {
       ap_status_t stat;
       ap_thread_t *thread;
    
  -    thread = (struct thread_t *)ap_palloc(cont, sizeof(struct thread_t));
  +    thread = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t));
       *new = thread;
   
       if (thread == NULL) {
  @@ -154,7 +154,7 @@
   
   
   
  -ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
  +ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd)
   {
       ULONG rc;
       TID waittid = thd->tid;
  @@ -169,7 +169,7 @@
   
   
   
  -ap_status_t ap_thread_detach(struct thread_t *thd)
  +ap_status_t ap_thread_detach(struct ap_thread_t *thd)
   {
       thd->attr->attr |= APR_THREADATTR_DETACHED;
       return APR_SUCCESS;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadcancel.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadcancel.c	2000/03/31 08:36:25	1.4
  +++ threadcancel.c	2000/04/03 18:37:46	1.5
  @@ -57,7 +57,7 @@
   #include "apr_general.h"
   #include "fileio.h"
   
  -ap_status_t ap_cancel_thread(struct thread_t *thd)
  +ap_status_t ap_cancel_thread(struct ap_thread_t *thd)
   {
       return os2errno(DosKillThread(thd->tid));
   }
  
  
  
  1.6       +5 -5      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.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadpriv.c	2000/03/31 08:36:25	1.5
  +++ threadpriv.c	2000/04/03 18:37:46	1.6
  @@ -59,10 +59,10 @@
   #include "apr_lib.h"
   #include "fileio.h"
   
  -ap_status_t ap_create_thread_private(struct threadkey_t **key,
  +ap_status_t ap_create_thread_private(struct ap_threadkey_t **key,
                                        void (*dest)(void *), ap_context_t *cont)
   {
  -    (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
  +    (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t));
   
       if ((*key) == NULL) {
           return APR_ENOMEM;
  @@ -72,19 +72,19 @@
       return os2errno(DosAllocThreadLocalMemory(1, &((*key)->key)));
   }
   
  -ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
  +ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key)
   {
       (*new) = (void *)*(key->key);
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
  +ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key)
   {
       *(key->key) = (ULONG)priv;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_delete_thread_private(struct threadkey_t *key)
  +ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key)
   {
       return os2errno(DosFreeThreadLocalMemory(key->key));
   }
  
  
  
  1.5       +7 -7      apache-2.0/src/lib/apr/threadproc/os2/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/os2/threadproc.h,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadproc.h	2000/03/31 08:36:25	1.4
  +++ threadproc.h	2000/04/03 18:37:46	1.5
  @@ -63,26 +63,26 @@
   #define SHELL_PATH "cmd.exe"
   #define APR_THREAD_STACKSIZE 65536
   
  -struct threadattr_t {
  +struct ap_threadattr_t {
       ap_context_t *cntxt;
       unsigned long attr;
   };
   
  -struct thread_t {
  +struct ap_thread_t {
       ap_context_t *cntxt;
  -    struct threadattr_t *attr;
  +    struct ap_threadattr_t *attr;
       unsigned long tid;
       ap_thread_start_t func;
       void *data;
       void *rv;
   };
   
  -struct threadkey_t {
  +struct ap_threadkey_t {
       ap_context_t *cntxt;
       unsigned long *key;
   };
   
  -struct procattr_t {
  +struct ap_procattr_t {
       ap_context_t *cntxt;
       ap_file_t *parent_in;
       ap_file_t *child_in;
  @@ -95,10 +95,10 @@
       ap_int32_t detached;
   };
   
  -struct proc_t {
  +struct ap_proc_t {
       ap_context_t *cntxt;
       pid_t pid;
  -    struct procattr_t *attr;
  +    struct ap_procattr_t *attr;
       int running;
   };
   
  
  
  
  1.19      +22 -22    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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- proc.c	2000/03/31 08:36:26	1.18
  +++ proc.c	2000/04/03 18:37:48	1.19
  @@ -61,10 +61,10 @@
    * arg 1) The newly created procattr. 
    * arg 2) The context to use
    */
  -ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
  +ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct procattr_t *)ap_palloc(cont, 
  -              sizeof(struct procattr_t));
  +    (*new) = (struct ap_procattr_t *)ap_palloc(cont, 
  +              sizeof(struct ap_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -92,7 +92,7 @@
    * arg 3) Should stdout be a pipe bnack to the parent?
    * arg 4) Should stderr be a pipe bnack to the parent?
    */
  -ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in, 
  +ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, 
                                    ap_int32_t out, ap_int32_t err)
   {
       ap_status_t status;
  @@ -159,7 +159,7 @@
    * arg 2) ap_file_t value to use as child_in. Must be a valid file.
    * arg 3) ap_file_t value to use as parent_in. Must be a valid file.
    */
  -ap_status_t ap_setprocattr_childin(struct procattr_t *attr, ap_file_t *child_in,
  +ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in,
                                      ap_file_t *parent_in)
   {
       if (attr->child_in == NULL && attr->parent_in == NULL)
  @@ -188,7 +188,7 @@
    * arg 2) ap_file_t value to use as child_out. Must be a valid file.
    * arg 3) ap_file_t value to use as parent_out. Must be a valid file.
    */
  -ap_status_t ap_setprocattr_childout(struct procattr_t *attr, ap_file_t *child_out,
  +ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child_out,
                                       ap_file_t *parent_out)
   {
       if (attr->child_out == NULL && attr->parent_out == NULL)
  @@ -217,7 +217,7 @@
    * arg 2) ap_file_t value to use as child_err. Must be a valid file.
    * arg 3) ap_file_t value to use as parent_err. Must be a valid file.
    */
  -ap_status_t ap_setprocattr_childerr(struct procattr_t *attr, ap_file_t *child_err,
  +ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child_err,
                                      ap_file_t *parent_err)
   {
       if (attr->child_err == NULL && attr->parent_err == NULL)
  @@ -241,7 +241,7 @@
    *        the parent currently resides in, when the createprocess call
    *        is made. 
    */
  -ap_status_t ap_setprocattr_dir(struct procattr_t *attr, 
  +ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, 
                                  const char *dir) 
   {
       attr->currdir = ap_pstrdup(attr->cntxt, dir);
  @@ -259,7 +259,7 @@
    *            APR_SHELLCMD --  Shell script
    *            APR_PROGRAM  --  Executable program   (default) 
    */
  -ap_status_t ap_setprocattr_cmdtype(struct procattr_t *attr,
  +ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr,
                                        ap_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
  @@ -272,7 +272,7 @@
    * arg 1) The procattr we care about. 
    * arg 2) Should the child start in detached state?  Default is no. 
    */
  -ap_status_t ap_setprocattr_detach(struct procattr_t *attr, ap_int32_t detach) 
  +ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t detach) 
   {
       attr->detached = detach;
       return APR_SUCCESS;
  @@ -285,11 +285,11 @@
    * arg 1) The resulting process handle. 
    * arg 2) The context to use. 
    */
  -ap_status_t ap_fork(struct proc_t **proc, ap_context_t *cont)
  +ap_status_t ap_fork(struct ap_proc_t **proc, ap_context_t *cont)
   {
       int pid;
       
  -    (*proc) = ap_palloc(cont, sizeof(struct proc_t));
  +    (*proc) = ap_palloc(cont, sizeof(struct ap_proc_t));
   
       if ((pid = fork()) < 0) {
           return errno;
  @@ -319,16 +319,16 @@
    *        process
    * arg 6) The context to use. 
    */
  -ap_status_t ap_create_process(struct proc_t **new, const char *progname, 
  +ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, 
                                 char *const args[], char **env,
  -                              struct procattr_t *attr, ap_context_t *cont)
  +                              struct ap_procattr_t *attr, ap_context_t *cont)
   {
       int i;
       typedef const char *my_stupid_string;
       my_stupid_string *newargs;
  -    struct proc_t *pgrp; 
  +    struct ap_proc_t *pgrp; 
   
  -    (*new) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +    (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -417,7 +417,7 @@
    * arg 1) The returned file handle. 
    * arg 2) The process handle that corresponds to the desired child process 
    */
  -ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_in;
       return APR_SUCCESS; 
  @@ -429,7 +429,7 @@
    * arg 1) The returned file handle. 
    * arg 2) The process handle that corresponds to the desired child process 
    */
  -ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_out; 
       return APR_SUCCESS;
  @@ -441,7 +441,7 @@
    * arg 1) The returned file handle. 
    * arg 2) The process handle that corresponds to the desired child process 
    */
  -ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
  @@ -460,7 +460,7 @@
    *            APR_CHILD_DONE     -- child is no longer running.
    *            APR_CHILD_NOTDONE  -- child is still running.
    */
  -ap_status_t ap_wait_proc(struct proc_t *proc, 
  +ap_status_t ap_wait_proc(struct ap_proc_t *proc, 
                              ap_wait_how_e waithow)
   {
       pid_t status;
  @@ -507,14 +507,14 @@
    * arg 2) The os specific proc to convert
    * arg 3) The context to use if it is needed.
    */
  -ap_status_t ap_put_os_proc(struct proc_t **proc, ap_os_proc_t *theproc, 
  +ap_status_t ap_put_os_proc(struct ap_proc_t **proc, ap_os_proc_t *theproc, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*proc) == NULL) {
  -        (*proc) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +        (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
           (*proc)->cntxt = cont;
       }
       (*proc)->pid = *theproc;
  
  
  
  1.13      +4 -4      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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- procsup.c	2000/03/31 08:36:26	1.12
  +++ procsup.c	2000/04/03 18:37:48	1.13
  @@ -60,11 +60,11 @@
    * arg 1) The new process handler
    * arg 2) The context to use if it is needed.
    */
  -ap_status_t ap_detach(struct proc_t **new, ap_context_t *cont)
  +ap_status_t ap_detach(struct ap_proc_t **new, ap_context_t *cont)
   {
       int x;
   
  -    (*new) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +    (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
       (*new)->cntxt = cont;
       (*new)->attr = NULL;
   
  @@ -131,7 +131,7 @@
    * arg 2) The user data associated with the proc.
    * arg 3) The currently open proc.
    */
  -ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
  +ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc)
   {
       if (proc != NULL) {
           return ap_get_userdata(data, key, proc->cntxt);
  @@ -153,7 +153,7 @@
   */
   ap_status_t ap_set_procdata(void *data, char *key, 
                               ap_status_t (*cleanup) (void *),
  -                            struct proc_t *proc)
  +                            struct ap_proc_t *proc)
   {
       if (proc != NULL) {
           return ap_set_userdata(data, key, cleanup, proc->cntxt);
  
  
  
  1.7       +1 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- signals.c	2000/03/31 08:36:27	1.6
  +++ signals.c	2000/04/03 18:37:48	1.7
  @@ -60,7 +60,7 @@
    * arg 1) The process to terminate.
    * arg 2) How to kill the process.
    */
  -ap_status_t ap_kill(struct proc_t *proc, int sig)
  +ap_status_t ap_kill(struct ap_proc_t *proc, int sig)
   {
       if (kill(proc->pid, sig) == -1) {
           return errno;
  
  
  
  1.14      +14 -14    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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- thread.c	2000/03/31 08:36:27	1.13
  +++ thread.c	2000/04/03 18:37:48	1.14
  @@ -64,12 +64,12 @@
    * arg 1) The newly created threadattr.
    * arg 2) The context to use
    */
  -ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
  +ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont)
   {
       ap_status_t stat;
     
  -    (*new) = (struct threadattr_t *)ap_palloc(cont, 
  -              sizeof(struct threadattr_t));
  +    (*new) = (struct ap_threadattr_t *)ap_palloc(cont, 
  +              sizeof(struct ap_threadattr_t));
       (*new)->attr = (pthread_attr_t *)ap_palloc(cont, 
                       sizeof(pthread_attr_t));
   
  @@ -92,7 +92,7 @@
    * arg 1) The threadattr to affect 
    * arg 2) Thread detach state on or off
    */
  -ap_status_t ap_setthreadattr_detach(struct threadattr_t *attr, ap_int32_t on)
  +ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on)
   {
       ap_status_t stat;
       if ((stat = pthread_attr_setdetachstate(attr->attr, on)) == 0) {
  @@ -108,7 +108,7 @@
    *    Get the detach mode for this threadattr.
    * arg 1) The threadattr to reference 
    */
  -ap_status_t ap_getthreadattr_detach(struct threadattr_t *attr)
  +ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr)
   {
       int state;
   
  @@ -129,14 +129,14 @@
    * arg 4) Any data to be passed to the starting function
    * arg 5) The context to use
    */
  -ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
  +ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
                                ap_context_t *cont)
   {
       ap_status_t stat;
       pthread_attr_t *temp;
    
  -    (*new) = (struct thread_t *)ap_palloc(cont, sizeof(struct thread_t));
  +    (*new) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -187,7 +187,7 @@
    * arg 1) The return value from the dead thread.
    * arg 2) The thread to join
    */
  -ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
  +ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd)
   {
       ap_status_t stat;
   
  @@ -204,7 +204,7 @@
    *    detach a thread
    * arg 1) The thread to detach 
    */
  -ap_status_t ap_thread_detach(struct thread_t *thd)
  +ap_status_t ap_thread_detach(struct ap_thread_t *thd)
   {
       ap_status_t stat;
   
  @@ -223,7 +223,7 @@
    * arg 2) The key to associate with the data
    * arg 3) The currently open thread.
    */
  -ap_status_t ap_get_threaddata(void **data, char *key, struct thread_t *thread)
  +ap_status_t ap_get_threaddata(void **data, char *key, struct ap_thread_t *thread)
   {
       if (thread != NULL) {
           return ap_get_userdata(data, key, thread->cntxt);
  @@ -246,7 +246,7 @@
    */
   ap_status_t ap_set_threaddata(void *data, char *key,
                                 ap_status_t (*cleanup) (void *),
  -                              struct thread_t *thread)
  +                              struct ap_thread_t *thread)
   {
       if (thread != NULL) {
           return ap_set_userdata(data, key, cleanup, thread->cntxt);
  @@ -263,7 +263,7 @@
    * arg 1) The apr thread to convert
    * arg 2) The os specific thread we are converting to
    */
  -ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct thread_t *thd)
  +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct ap_thread_t *thd)
   {
       if (thd == NULL) {
           return APR_ENOTHREAD;
  @@ -280,14 +280,14 @@
    * arg 2) The os specific thread to convert
    * arg 3) The context to use if it is needed.
    */
  -ap_status_t ap_put_os_thread(struct thread_t **thd, ap_os_thread_t *thethd, 
  +ap_status_t ap_put_os_thread(struct ap_thread_t **thd, ap_os_thread_t *thethd, 
                                ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*thd) == NULL) {
  -        (*thd) = (struct thread_t *)ap_palloc(cont, sizeof(struct thread_t));
  +        (*thd) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t));
           (*thd)->cntxt = cont;
       }
       (*thd)->td = thethd;
  
  
  
  1.9       +1 -1      apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadcancel.c,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- threadcancel.c	2000/03/31 08:36:27	1.8
  +++ threadcancel.c	2000/04/03 18:37:49	1.9
  @@ -63,7 +63,7 @@
    *    Asynchronously kill a thread
    * arg 1) The thread to kill.
    */
  -ap_status_t ap_cancel_thread(struct thread_t *thd)
  +ap_status_t ap_cancel_thread(struct ap_thread_t *thd)
   {
       ap_status_t stat;
       if ((stat = pthread_cancel(*thd->td)) == 0) {
  
  
  
  1.13      +10 -10    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.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- threadpriv.c	2000/03/31 08:36:27	1.12
  +++ threadpriv.c	2000/04/03 18:37:49	1.13
  @@ -67,11 +67,11 @@
    * arg 2) The destructor to use when freeing the private memory.
    * arg 3) The context to use
    */
  -ap_status_t ap_create_thread_private(struct threadkey_t **key, 
  +ap_status_t ap_create_thread_private(struct ap_threadkey_t **key, 
                                        void (*dest)(void *), ap_context_t *cont)
   {
       ap_status_t stat;
  -    (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
  +    (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t));
   
       if ((*key) == NULL) {
           return APR_ENOMEM;
  @@ -91,7 +91,7 @@
    * arg 1) The data stored in private memory 
    * arg 2) The handle for the desired thread private memory 
    */
  -ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
  +ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key)
   {
       (*new) = pthread_getspecific(key->key);
       return APR_SUCCESS;
  @@ -103,7 +103,7 @@
    * arg 1) The data to be stored in private memory 
    * arg 2) The handle for the desired thread private memory 
    */
  -ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
  +ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key)
   {
       ap_status_t stat;
       if ((stat = pthread_setspecific(key->key, priv)) == 0) {
  @@ -119,7 +119,7 @@
    *    Free the thread private memory
    * arg 1) The handle for the desired thread private memory 
    */
  -ap_status_t ap_delete_thread_private(struct threadkey_t *key)
  +ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key)
   {
       ap_status_t stat;
       if ((stat = pthread_key_delete(key->key)) == 0) {
  @@ -136,7 +136,7 @@
    * arg 2) The key associated with the data
    * arg 3) The currently open threadkey.
    */
  -ap_status_t ap_get_threadkeydata(void **data, char *key, struct threadkey_t *threadkey)
  +ap_status_t ap_get_threadkeydata(void **data, char *key, struct ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_get_userdata(data, key, threadkey->cntxt);
  @@ -159,7 +159,7 @@
    */
   ap_status_t ap_set_threadkeydata(void *data,
                                    char *key, ap_status_t (*cleanup) (void *),
  -                                 struct threadkey_t *threadkey)
  +                                 struct ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_set_userdata(data, key, cleanup, threadkey->cntxt);
  @@ -177,7 +177,7 @@
    * arg 1) The apr handle we are converting from.
    * arg 2) The os specific handle we are converting to.
    */
  -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct threadkey_t *key)
  +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct ap_threadkey_t *key)
   {
       if (key == NULL) {
           return APR_ENOFILE;
  @@ -194,14 +194,14 @@
    * arg 2) The os specific handle to convert
    * arg 3) The context to use if it is needed.
    */
  -ap_status_t ap_put_os_threadkey(struct threadkey_t **key, 
  +ap_status_t ap_put_os_threadkey(struct ap_threadkey_t **key, 
                                   ap_os_threadkey_t *thekey, ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*key) == NULL) {
  -        (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
  +        (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t));
           (*key)->cntxt = cont;
       }
       (*key)->key = *thekey;
  
  
  
  1.8       +7 -7      apache-2.0/src/lib/apr/threadproc/unix/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/unix/threadproc.h,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- threadproc.h	2000/03/31 08:36:27	1.7
  +++ threadproc.h	2000/04/03 18:37:49	1.8
  @@ -82,23 +82,23 @@
   #define SHELL_PATH "/bin/sh"
   
   #if APR_HAS_THREADS
  -struct thread_t {
  +struct ap_thread_t {
       ap_context_t *cntxt;
       pthread_t *td;
   };
   
  -struct threadattr_t {
  +struct ap_threadattr_t {
       ap_context_t *cntxt;
       pthread_attr_t *attr;
   };
   
  -struct threadkey_t {
  +struct ap_threadkey_t {
       ap_context_t *cntxt;
       pthread_key_t key;
   };
   #endif
   
  -struct procattr_t {
  +struct ap_procattr_t {
       ap_context_t *cntxt;
       ap_file_t *parent_in;
       ap_file_t *child_in;
  @@ -111,16 +111,16 @@
       ap_int32_t detached;
   };
   
  -struct proc_t {
  +struct ap_proc_t {
       ap_context_t *cntxt;
       pid_t pid;
  -    struct procattr_t *attr;
  +    struct ap_procattr_t *attr;
   };
   
   /*This will move to ap_threadproc.h in time, but I need to figure it out
    * on windows first.  :)
    */
  -ap_status_t ap_detach(struct proc_t **, ap_context_t *);
  +ap_status_t ap_detach(struct ap_proc_t **, ap_context_t *);
   
   #endif  /* ! THREAD_PROC_H */
   
  
  
  
  1.20      +21 -21    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.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- proc.c	2000/03/31 08:36:28	1.19
  +++ proc.c	2000/04/03 18:37:52	1.20
  @@ -65,10 +65,10 @@
   #include <string.h>
   #include <process.h>
   
  -ap_status_t ap_createprocattr_init(struct procattr_t **new, ap_context_t *cont)
  +ap_status_t ap_createprocattr_init(struct ap_procattr_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct procattr_t *)ap_palloc(cont, 
  -              sizeof(struct procattr_t));
  +    (*new) = (struct ap_procattr_t *)ap_palloc(cont, 
  +              sizeof(struct ap_procattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -89,7 +89,7 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_io(struct procattr_t *attr, ap_int32_t in, 
  +ap_status_t ap_setprocattr_io(struct ap_procattr_t *attr, ap_int32_t in, 
                                 ap_int32_t out, ap_int32_t err)
   {
       ap_status_t stat;
  @@ -114,11 +114,11 @@
       return APR_SUCCESS;
   }
   #if 0
  -ap_status_t ap_setprocattr_childin(struct procattr_t *attr, ap_file_t *child_in,
  +ap_status_t ap_setprocattr_childin(struct ap_procattr_t *attr, ap_file_t *child_in,
                                      ap_file_t *parent_in)
   {
   }
  -ap_status_t ap_setprocattr_childout(struct procattr_t *attr, ap_file_t *child_out,
  +ap_status_t ap_setprocattr_childout(struct ap_procattr_t *attr, ap_file_t *child_out,
                                       ap_file_t *parent_out)
   {
       if (attr->child_out == NULL && attr->parent_out == NULL)
  @@ -132,7 +132,7 @@
   
       return APR_SUCCESS;
   }
  -ap_status_t ap_setprocattr_childerr(struct procattr_t *attr, ap_file_t *child_err,
  +ap_status_t ap_setprocattr_childerr(struct ap_procattr_t *attr, ap_file_t *child_err,
                                      ap_file_t *parent_err)
   {
       if (attr->child_err == NULL && attr->parent_err == NULL)
  @@ -146,7 +146,7 @@
       return APR_SUCCESS;
   }
   #endif
  -ap_status_t ap_setprocattr_dir(struct procattr_t *attr, 
  +ap_status_t ap_setprocattr_dir(struct ap_procattr_t *attr, 
                                  const char *dir) 
   {
       char path[MAX_PATH];
  @@ -170,22 +170,22 @@
       return APR_ENOMEM;
   }
   
  -ap_status_t ap_setprocattr_cmdtype(struct procattr_t *attr,
  +ap_status_t ap_setprocattr_cmdtype(struct ap_procattr_t *attr,
                                        ap_cmdtype_e cmd) 
   {
       attr->cmdtype = cmd;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setprocattr_detach(struct procattr_t *attr, ap_int32_t det) 
  +ap_status_t ap_setprocattr_detach(struct ap_procattr_t *attr, ap_int32_t det) 
   {
       attr->detached = det;
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_create_process(struct proc_t **new, const char *progname, 
  +ap_status_t ap_create_process(struct ap_proc_t **new, const char *progname, 
                                 char *const args[], char **env, 
  -                              struct procattr_t *attr, ap_context_t *cont)
  +                              struct ap_procattr_t *attr, ap_context_t *cont)
   {
       int i, iEnvBlockLen;
       char *cmdline;
  @@ -195,7 +195,7 @@
       char *envstr;
       char *pEnvBlock, *pNext;
   
  -    (*new) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +    (*new) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -364,25 +364,25 @@
       return GetLastError();
   }
   
  -ap_status_t ap_get_childin(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childin(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_in;
       return APR_SUCCESS; 
   }
   
  -ap_status_t ap_get_childout(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childout(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_out; 
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_childerr(ap_file_t **new, struct proc_t *proc)
  +ap_status_t ap_get_childerr(ap_file_t **new, struct ap_proc_t *proc)
   {
       (*new) = proc->attr->parent_err; 
       return APR_SUCCESS;
   }    
   
  -ap_status_t ap_wait_proc(struct proc_t *proc, 
  +ap_status_t ap_wait_proc(struct ap_proc_t *proc, 
                            ap_wait_how_e wait)
   {
       DWORD stat;
  @@ -406,7 +406,7 @@
       return GetLastError();
   }
   
  -ap_status_t ap_get_procdata(char *key, void *data, struct proc_t *proc)
  +ap_status_t ap_get_procdata(char *key, void *data, struct ap_proc_t *proc)
   {
       if (proc != NULL) {
           return ap_get_userdata(data, key, proc->cntxt);
  @@ -419,7 +419,7 @@
   
   ap_status_t ap_set_procdata(void *data, char *key,
                               ap_status_t (*cleanup) (void *),
  -                            struct proc_t *proc)
  +                            struct ap_proc_t *proc)
   {
       if (proc != NULL) {
           return ap_set_userdata(data, key, cleanup, proc->cntxt);
  @@ -439,14 +439,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_proc(struct proc_t **proc, ap_os_proc_t *theproc, 
  +ap_status_t ap_put_os_proc(struct ap_proc_t **proc, ap_os_proc_t *theproc, 
                              ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*proc) == NULL) {
  -        (*proc) = (struct proc_t *)ap_palloc(cont, sizeof(struct proc_t));
  +        (*proc) = (struct ap_proc_t *)ap_palloc(cont, sizeof(struct ap_proc_t));
           (*proc)->cntxt = cont;
       }
       (*proc)->pi = *theproc;
  
  
  
  1.4       +1 -1      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- signals.c	2000/03/31 08:36:28	1.3
  +++ signals.c	2000/04/03 18:37:53	1.4
  @@ -64,7 +64,7 @@
   #endif
   
   /* Windows only really support killing process, but that will do for now. */
  -ap_status_t ap_kill(struct proc_t *proc, int signal)
  +ap_status_t ap_kill(struct ap_proc_t *proc, int signal)
   {
       if (TerminateProcess(proc->pi.hProcess, signal) == 0) {
           return errno;
  
  
  
  1.12      +14 -14    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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- thread.c	2000/03/31 08:36:28	1.11
  +++ thread.c	2000/04/03 18:37:53	1.12
  @@ -61,10 +61,10 @@
   #include <process.h>
   
   
  -ap_status_t ap_create_threadattr(struct threadattr_t **new, ap_context_t *cont)
  +ap_status_t ap_create_threadattr(struct ap_threadattr_t **new, ap_context_t *cont)
   {
  -    (*new) = (struct threadattr_t *)ap_palloc(cont, 
  -              sizeof(struct threadattr_t));
  +    (*new) = (struct ap_threadattr_t *)ap_palloc(cont, 
  +              sizeof(struct ap_threadattr_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -74,20 +74,20 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_setthreadattr_detach(struct threadattr_t *attr, ap_int32_t on)
  +ap_status_t ap_setthreadattr_detach(struct ap_threadattr_t *attr, ap_int32_t on)
   {
       attr->detach = on;
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_getthreadattr_detach(struct threadattr_t *attr)
  +ap_status_t ap_getthreadattr_detach(struct ap_threadattr_t *attr)
   {
       if (attr->detach == 1)
           return APR_DETACH;
       return APR_NOTDETACH;
   }
   
  -ap_status_t ap_create_thread(struct thread_t **new, struct threadattr_t *attr, 
  +ap_status_t ap_create_thread(struct ap_thread_t **new, struct ap_threadattr_t *attr, 
                                ap_thread_start_t func, void *data, 
                                ap_context_t *cont)
   {
  @@ -95,7 +95,7 @@
   	unsigned temp;
       int lasterror;
    
  -    (*new) = (struct thread_t *)ap_palloc(cont, sizeof(struct thread_t));
  +    (*new) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t));
   
       if ((*new) == NULL) {
           return APR_ENOMEM;
  @@ -131,7 +131,7 @@
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_thread_join(ap_status_t *retval, struct thread_t *thd)
  +ap_status_t ap_thread_join(ap_status_t *retval, struct ap_thread_t *thd)
   {
       ap_status_t stat;
   
  @@ -146,7 +146,7 @@
       }
   }
   
  -ap_status_t ap_thread_detach(struct thread_t *thd)
  +ap_status_t ap_thread_detach(struct ap_thread_t *thd)
   {
       if (CloseHandle(thd->td)) {
           return APR_SUCCESS;
  @@ -156,7 +156,7 @@
       }
   }
   
  -ap_status_t ap_get_threaddata(void **data, char *key, struct thread_t *thread)
  +ap_status_t ap_get_threaddata(void **data, char *key, struct ap_thread_t *thread)
   {
       if (thread != NULL) {
           return ap_get_userdata(data, key, thread->cntxt);
  @@ -169,7 +169,7 @@
   
   ap_status_t ap_set_threaddata(void *data, char *key,
                                 ap_status_t (*cleanup) (void *),
  -                              struct thread_t *thread)
  +                              struct ap_thread_t *thread)
   {
       if (thread != NULL) {
           return ap_set_userdata(data, key, cleanup, thread->cntxt);
  @@ -180,7 +180,7 @@
       }
   }
   
  -ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct thread_t *thd)
  +ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, struct ap_thread_t *thd)
   {
       if (thd == NULL) {
           return APR_ENOTHREAD;
  @@ -189,14 +189,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_thread(struct thread_t **thd, ap_os_thread_t *thethd, 
  +ap_status_t ap_put_os_thread(struct ap_thread_t **thd, ap_os_thread_t *thethd, 
                                ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*thd) == NULL) {
  -        (*thd) = (struct thread_t *)ap_palloc(cont, sizeof(struct thread_t));
  +        (*thd) = (struct ap_thread_t *)ap_palloc(cont, sizeof(struct ap_thread_t));
           (*thd)->cntxt = cont;
       }
       (*thd)->td = thethd;
  
  
  
  1.5       +1 -1      apache-2.0/src/lib/apr/threadproc/win32/threadcancel.c
  
  Index: threadcancel.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadcancel.c,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- threadcancel.c	2000/03/31 08:36:28	1.4
  +++ threadcancel.c	2000/04/03 18:37:53	1.5
  @@ -57,7 +57,7 @@
   #include "apr_general.h"
   
   
  -ap_status_t ap_cancel_thread(struct thread_t *thd)
  +ap_status_t ap_cancel_thread(struct ap_thread_t *thd)
   {
       if (TerminateThread(thd->td, APR_SUCCESS) == 0) {
           return APR_EEXIST;
  
  
  
  1.11      +9 -9      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.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- threadpriv.c	2000/03/31 08:36:28	1.10
  +++ threadpriv.c	2000/04/03 18:37:53	1.11
  @@ -59,14 +59,14 @@
   #include "apr_errno.h"
   #include "apr_portable.h"
   
  -ap_status_t ap_create_thread_private(struct threadkey_t **key,
  +ap_status_t ap_create_thread_private(struct ap_threadkey_t **key,
                                        void (*dest)(void *), ap_context_t *cont)
   {
   	(*key)->key = TlsAlloc();
   	return APR_SUCCESS;
   }
   
  -ap_status_t ap_get_thread_private(void **new, struct threadkey_t *key)
  +ap_status_t ap_get_thread_private(void **new, struct ap_threadkey_t *key)
   {
       if ((*new) = TlsGetValue(key->key)) {
           return APR_SUCCESS;
  @@ -74,7 +74,7 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_set_thread_private(void *priv, struct threadkey_t *key)
  +ap_status_t ap_set_thread_private(void *priv, struct ap_threadkey_t *key)
   {
       if (TlsSetValue(key->key, priv)) {
           return APR_SUCCESS;
  @@ -82,7 +82,7 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_delete_thread_private(struct threadkey_t *key)
  +ap_status_t ap_delete_thread_private(struct ap_threadkey_t *key)
   {
       if (TlsFree(key->key)) {
           return APR_SUCCESS; 
  @@ -90,7 +90,7 @@
       return APR_EEXIST;
   }
   
  -ap_status_t ap_get_threadkeydata(void **data, char *key, struct threadkey_t *threadkey)
  +ap_status_t ap_get_threadkeydata(void **data, char *key, struct ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_get_userdata(data, key, threadkey->cntxt);
  @@ -102,7 +102,7 @@
   }
   
   ap_status_t ap_set_threadkeydata(void *data, char *key, ap_status_t (*cleanup) (void *), 
  -                                 struct threadkey_t *threadkey)
  +                                 struct ap_threadkey_t *threadkey)
   {
       if (threadkey != NULL) {
           return ap_set_userdata(data, key, cleanup, threadkey->cntxt);
  @@ -113,7 +113,7 @@
       }
   }
   
  -ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct threadkey_t *key)
  +ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, struct ap_threadkey_t *key)
   {
       if (key == NULL) {
           return APR_ENOFILE;
  @@ -122,14 +122,14 @@
       return APR_SUCCESS;
   }
   
  -ap_status_t ap_put_os_threadkey(struct threadkey_t **key, 
  +ap_status_t ap_put_os_threadkey(struct ap_threadkey_t **key, 
                                   ap_os_threadkey_t *thekey, ap_context_t *cont)
   {
       if (cont == NULL) {
           return APR_ENOCONT;
       }
       if ((*key) == NULL) {
  -        (*key) = (struct threadkey_t *)ap_palloc(cont, sizeof(struct threadkey_t));
  +        (*key) = (struct ap_threadkey_t *)ap_palloc(cont, sizeof(struct ap_threadkey_t));
           (*key)->cntxt = cont;
       }
       (*key)->key = *thekey;
  
  
  
  1.6       +6 -6      apache-2.0/src/lib/apr/threadproc/win32/threadproc.h
  
  Index: threadproc.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/lib/apr/threadproc/win32/threadproc.h,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- threadproc.h	2000/03/31 08:36:29	1.5
  +++ threadproc.h	2000/04/03 18:37:53	1.6
  @@ -62,24 +62,24 @@
   
   #define SHELL_PATH "cmd.exe"
   
  -struct thread_t {
  +struct ap_thread_t {
       ap_context_t *cntxt;
       HANDLE td;
       ap_int32_t cancel;
       ap_int32_t cancel_how;
   };
   
  -struct threadattr_t {
  +struct ap_threadattr_t {
       ap_context_t *cntxt;
       ap_int32_t detach;
   };
   
  -struct threadkey_t {
  +struct ap_threadkey_t {
       ap_context_t *cntxt;
       DWORD key;
   };
   
  -struct procattr_t {
  +struct ap_procattr_t {
       ap_context_t *cntxt;
       STARTUPINFO si;
       ap_file_t *parent_in;
  @@ -93,10 +93,10 @@
       ap_int32_t detached;
   };
   
  -struct proc_t {
  +struct ap_proc_t {
       ap_context_t *cntxt;
       PROCESS_INFORMATION pi;
  -    struct procattr_t *attr;
  +    struct ap_procattr_t *attr;
   };
   
   #endif  /* ! THREAD_PROC_H */
  
  
  

Mime
View raw message