fix the rest of the struct foo_t to struct ap_foo_t. Next is removing the

struct's where possible.


git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@59769 13f79535-47bb-0310-9956-ffa450edef68

32 files changed, 106 insertions, 106 deletions

diff --git a/include/apr_dso.h b/include/apr_dso.h
index cfae2f5be..b0ff714b6 100644
--- a/include/apr_dso.h
+++ b/include/apr_dso.h
@@ -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);
diff --git a/include/apr_file_io.h b/include/apr_file_io.h
index aa087367c..81178a202 100644
--- a/include/apr_file_io.h
+++ b/include/apr_file_io.h
@@ -106,7 +106,7 @@ typedef ap_int32_t       ap_seek_where_t;
 
 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;
diff --git a/include/apr_general.h b/include/apr_general.h
index 38ef0ada8..7efab6392 100644
--- a/include/apr_general.h
+++ b/include/apr_general.h
@@ -81,7 +81,7 @@ extern "C" {
 
 #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 @@ typedef int               ap_signum_t;
 
 /* 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 *), 
diff --git a/include/apr_lib.h b/include/apr_lib.h
index 731385319..0ac0d4f25 100644
--- a/include/apr_lib.h
+++ b/include/apr_lib.h
@@ -264,8 +264,8 @@ API_EXPORT(int) ap_vsnprintf(char *buf, size_t len, const char *format,
  * 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 @@ API_EXPORT(void) ap_pool_join(ap_pool_t *p, ap_pool_t *sub);
 #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 @@ API_EXPORT(void) ap_table_add(ap_table_t *t, const char *key,
 			       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 @@ API_EXPORT(void)
 #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,
diff --git a/include/apr_lock.h b/include/apr_lock.h
index 3cb1c79d1..bf6372232 100644
--- a/include/apr_lock.h
+++ b/include/apr_lock.h
@@ -66,7 +66,7 @@ typedef enum {APR_CROSS_PROCESS, APR_INTRAPROCESS, APR_LOCKALL} ap_lockscope_e;
 
 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, 
diff --git a/include/apr_mmap.h b/include/apr_mmap.h
index bae221793..76aff543c 100644
--- a/include/apr_mmap.h
+++ b/include/apr_mmap.h
@@ -65,7 +65,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 
-typedef struct mmap_t            ap_mmap_t;
+typedef struct ap_mmap_t            ap_mmap_t;
 
 /*   Function definitions */
 
diff --git a/include/apr_network_io.h b/include/apr_network_io.h
index 4efb3f12f..7d0799a11 100644
--- a/include/apr_network_io.h
+++ b/include/apr_network_io.h
@@ -120,14 +120,14 @@ struct in_addr {
 #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;
diff --git a/include/apr_pools.h b/include/apr_pools.h
index 8b57f8cb9..6199cde3c 100644
--- a/include/apr_pools.h
+++ b/include/apr_pools.h
@@ -153,7 +153,7 @@ void        ap_term_alloc(void);        /* Tear down everything */
 
 /* 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.
diff --git a/include/apr_portable.h b/include/apr_portable.h
index 4e94b50d5..815b70126 100644
--- a/include/apr_portable.h
+++ b/include/apr_portable.h
@@ -112,7 +112,7 @@ typedef struct tm             ap_os_exp_time_t;
 #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 @@ struct os_lock_t {
 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 @@ union semun {
 };
 #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 @@ struct os_lock_t {
 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;
diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h
index 340ec566a..a7581a141 100644
--- a/include/apr_thread_proc.h
+++ b/include/apr_thread_proc.h
@@ -77,12 +77,12 @@ typedef enum {APR_WAIT, APR_NOWAIT} ap_wait_how_e;
 #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_set_threadkeydata(void *data, char *key,
 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);
diff --git a/include/arch/aix/dso.h b/include/arch/aix/dso.h
index f5d186d51..89c33f5c0 100644
--- a/include/arch/aix/dso.h
+++ b/include/arch/aix/dso.h
@@ -65,7 +65,7 @@ void *dlsym(void *handle, const char *symbol);
 const char *dlerror(void);
 int dlclose(void *handle);
 
-struct dso_handle_t {
+struct ap_dso_handle_t {
     ap_context_t  *cont;
     void          *handle;
 };
diff --git a/include/arch/beos/dso.h b/include/arch/beos/dso.h
index 4305bba6c..d863ae1cc 100644
--- a/include/arch/beos/dso.h
+++ b/include/arch/beos/dso.h
@@ -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;
 };
diff --git a/include/arch/beos/locks.h b/include/arch/beos/locks.h
index 7f5dabd3b..d88f2fcde 100644
--- a/include/arch/beos/locks.h
+++ b/include/arch/beos/locks.h
@@ -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;
diff --git a/include/arch/beos/networkio.h b/include/arch/beos/networkio.h
index 91253c0c1..c085fc332 100644
--- a/include/arch/beos/networkio.h
+++ b/include/arch/beos/networkio.h
@@ -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 @@ struct socket_t {
     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;
diff --git a/include/arch/beos/threadproc.h b/include/arch/beos/threadproc.h
index 73ea8ef54..70b0f2eab 100644
--- a/include/arch/beos/threadproc.h
+++ b/include/arch/beos/threadproc.h
@@ -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 @@ struct beos_key {
 	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 @@ struct procattr_t {
     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
diff --git a/include/arch/os2/dso.h b/include/arch/os2/dso.h
index 0ef121ea1..947793aa4 100644
--- a/include/arch/os2/dso.h
+++ b/include/arch/os2/dso.h
@@ -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 */
 };
diff --git a/include/arch/os2/fileio.h b/include/arch/os2/fileio.h
index 1706c95dc..68d93881f 100644
--- a/include/arch/os2/fileio.h
+++ b/include/arch/os2/fileio.h
@@ -82,7 +82,7 @@ struct ap_file_t {
     unsigned long filePtr;    // position in file of handle
 };
 
-struct dir_t {
+struct ap_dir_t {
     ap_context_t *cntxt;
     char *dirname;
     ULONG handle;
diff --git a/include/arch/os2/locks.h b/include/arch/os2/locks.h
index 5678f79a1..9dcf0f293 100644
--- a/include/arch/os2/locks.h
+++ b/include/arch/os2/locks.h
@@ -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;
diff --git a/include/arch/os2/networkio.h b/include/arch/os2/networkio.h
index d64f038b3..de7324e24 100644
--- a/include/arch/os2/networkio.h
+++ b/include/arch/os2/networkio.h
@@ -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 @@ struct socket_t {
     int nonblock;
 };
 
-struct pollfd_t {
+struct ap_pollfd_t {
     ap_context_t *cntxt;
     int *socket_list;
     int *r_socket_list;
diff --git a/include/arch/os2/threadproc.h b/include/arch/os2/threadproc.h
index 37915daa8..a4f2e3ce4 100644
--- a/include/arch/os2/threadproc.h
+++ b/include/arch/os2/threadproc.h
@@ -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 @@ struct procattr_t {
     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;
 };
 
diff --git a/include/arch/unix/dso.h b/include/arch/unix/dso.h
index ca12945d4..6eb2de665 100644
--- a/include/arch/unix/dso.h
+++ b/include/arch/unix/dso.h
@@ -82,7 +82,7 @@
 #define DLSYM_NEEDS_UNDERSCORE
 #endif
 
-struct dso_handle_t {
+struct ap_dso_handle_t {
     ap_context_t  *cont;
     void          *handle;
 };
diff --git a/include/arch/unix/fileio.h b/include/arch/unix/fileio.h
index a8a5683c4..ce3904f07 100644
--- a/include/arch/unix/fileio.h
+++ b/include/arch/unix/fileio.h
@@ -112,7 +112,7 @@ struct ap_file_t {
     int timeout;
 };
 
-struct dir_t {
+struct ap_dir_t {
     ap_context_t *cntxt;
     char *dirname;
     DIR *dirstruct;
diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h
index ce910d3d2..efff844a2 100644
--- a/include/arch/unix/locks.h
+++ b/include/arch/unix/locks.h
@@ -108,7 +108,7 @@ union semun {
 };
 #endif
 
-struct lock_t {
+struct ap_lock_t {
     ap_context_t *cntxt;
     ap_locktype_e type;
     ap_lockscope_e scope;
@@ -138,19 +138,19 @@ struct lock_t {
 };
 
 #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 */
diff --git a/include/arch/unix/misc.h b/include/arch/unix/misc.h
index aa6d1260f..fffa9365f 100644
--- a/include/arch/unix/misc.h
+++ b/include/arch/unix/misc.h
@@ -82,7 +82,7 @@ typedef struct datastruct {
     struct datastruct *prev;
 } datastruct;
 
-struct context_t {
+struct ap_context_t {
     struct ap_pool_t *pool;
     datastruct *prog_data;
     int (*apr_abort)(int retcode);
diff --git a/include/arch/unix/mmap.c b/include/arch/unix/mmap.c
index dd24215db..3cfcda7b3 100644
--- a/include/arch/unix/mmap.c
+++ b/include/arch/unix/mmap.c
@@ -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 @@ ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset,
     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 @@ ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset,
  *    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;
 
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h
index d919ba9b1..98fbda7e9 100644
--- a/include/arch/unix/networkio.h
+++ b/include/arch/unix/networkio.h
@@ -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 @@ struct socket_t {
 #endif
 };
 
-struct pollfd_t {
+struct ap_pollfd_t {
     ap_context_t *cntxt;
 #ifdef HAVE_POLL
     int *sock;
diff --git a/include/arch/unix/threadproc.h b/include/arch/unix/threadproc.h
index 98b32fa8d..7aba340f7 100644
--- a/include/arch/unix/threadproc.h
+++ b/include/arch/unix/threadproc.h
@@ -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 @@ struct procattr_t {
     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 */
 
diff --git a/include/arch/win32/fileio.h b/include/arch/win32/fileio.h
index 850b8bac1..2ec1ca07b 100644
--- a/include/arch/win32/fileio.h
+++ b/include/arch/win32/fileio.h
@@ -112,7 +112,7 @@ struct ap_file_t {
     time_t ctime;
 };
 
-struct dir_t {
+struct ap_dir_t {
     ap_context_t *cntxt;
     char *dirname;
     HANDLE dirhand;
@@ -122,9 +122,9 @@ struct dir_t {
 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 */
 
diff --git a/include/arch/win32/locks.h b/include/arch/win32/locks.h
index 7f1e2df33..7c89002f0 100644
--- a/include/arch/win32/locks.h
+++ b/include/arch/win32/locks.h
@@ -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;
diff --git a/include/arch/win32/misc.h b/include/arch/win32/misc.h
index aa6d1260f..fffa9365f 100644
--- a/include/arch/win32/misc.h
+++ b/include/arch/win32/misc.h
@@ -82,7 +82,7 @@ typedef struct datastruct {
     struct datastruct *prev;
 } datastruct;
 
-struct context_t {
+struct ap_context_t {
     struct ap_pool_t *pool;
     datastruct *prog_data;
     int (*apr_abort)(int retcode);
diff --git a/include/arch/win32/networkio.h b/include/arch/win32/networkio.h
index 9b934e8aa..a008062ea 100644
--- a/include/arch/win32/networkio.h
+++ b/include/arch/win32/networkio.h
@@ -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 @@ struct socket_t {
     int timeout;
 };
 
-struct pollfd_t {
+struct ap_pollfd_t {
     ap_context_t *cntxt;
     fd_set *read;
     int numread;
diff --git a/include/arch/win32/threadproc.h b/include/arch/win32/threadproc.h
index e9d3bcf72..2388bd7e2 100644
--- a/include/arch/win32/threadproc.h
+++ b/include/arch/win32/threadproc.h
@@ -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 @@ struct procattr_t {
     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 */