7 files changed, 14 insertions, 20 deletions
diff --git a/include/arch/unix/dso.h b/include/arch/unix/dso.h
index 6eb2de665..01a1c9c59 100644
--- a/include/arch/unix/dso.h
+++ b/include/arch/unix/dso.h
@@ -83,7 +83,7 @@
 #endif
 
 struct ap_dso_handle_t {
-    ap_context_t  *cont;
+    ap_pool_t  *cont;
     void          *handle;
 };
 
diff --git a/include/arch/unix/fileio.h b/include/arch/unix/fileio.h
index 3dcaa81d8..6eb7df9f4 100644
--- a/include/arch/unix/fileio.h
+++ b/include/arch/unix/fileio.h
@@ -101,7 +101,7 @@
 /* End System headers */
 
 struct ap_file_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     int filedes;
     char * fname;
     int oflags;
@@ -112,7 +112,7 @@ struct ap_file_t {
 };
 
 struct ap_dir_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     char *dirname;
     DIR *dirstruct;
     struct dirent *entry;
diff --git a/include/arch/unix/locks.h b/include/arch/unix/locks.h
index 9938d6797..e10d89086 100644
--- a/include/arch/unix/locks.h
+++ b/include/arch/unix/locks.h
@@ -109,7 +109,7 @@ union semun {
 #endif
 
 struct ap_lock_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     ap_locktype_e type;
     ap_lockscope_e scope;
     int curr_locked;
@@ -150,7 +150,7 @@ ap_status_t ap_unix_lock_inter(struct ap_lock_t *lock);
 ap_status_t ap_unix_unlock_inter(struct ap_lock_t *lock);
 ap_status_t ap_unix_destroy_inter_lock(struct ap_lock_t *lock);
 
-ap_status_t ap_unix_child_init_lock(struct ap_lock_t **lock, ap_context_t *cont, 
+ap_status_t ap_unix_child_init_lock(struct ap_lock_t **lock, ap_pool_t *cont, 
                             const char *fname);
 
 #endif  /* LOCKS_H */
diff --git a/include/arch/unix/misc.h b/include/arch/unix/misc.h
index dfe0413a9..4e6b51d62 100644
--- a/include/arch/unix/misc.h
+++ b/include/arch/unix/misc.h
@@ -85,12 +85,6 @@ typedef struct datastruct {
     struct datastruct *prev;
 } datastruct;
 
-struct ap_context_t {
-    struct ap_pool_t *pool;
-    datastruct *prog_data;
-    int (*apr_abort)(int retcode);
-};
-
 struct ap_other_child_rec_t {
     struct ap_other_child_rec_t *next;
     int pid;
diff --git a/include/arch/unix/mmap.c b/include/arch/unix/mmap.c
index c2c48869a..5e5b571f7 100644
--- a/include/arch/unix/mmap.c
+++ b/include/arch/unix/mmap.c
@@ -77,7 +77,7 @@ static ap_status_t mmap_cleanup(void *themmap)
 }
 
 ap_status_t ap_mmap_create(ap_mmap_t **new, ap_file_t *file, ap_off_t offset, 
-       ap_size_t size, ap_context_t *cont)
+       ap_size_t size, ap_pool_t *cont)
 {
     caddr_t mm;
    
diff --git a/include/arch/unix/networkio.h b/include/arch/unix/networkio.h
index d3e3f732c..951c045a7 100644
--- a/include/arch/unix/networkio.h
+++ b/include/arch/unix/networkio.h
@@ -107,7 +107,7 @@
 /* End System Headers */
 
 struct ap_socket_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     int socketdes;
     struct sockaddr_in *local_addr;
     struct sockaddr_in *remote_addr;
@@ -119,7 +119,7 @@ struct ap_socket_t {
 };
 
 struct ap_pollfd_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
 #ifdef HAVE_POLL
     int *sock;
     int curpos;
diff --git a/include/arch/unix/threadproc.h b/include/arch/unix/threadproc.h
index 7aba340f7..45fe78707 100644
--- a/include/arch/unix/threadproc.h
+++ b/include/arch/unix/threadproc.h
@@ -83,23 +83,23 @@
 
 #if APR_HAS_THREADS
 struct ap_thread_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     pthread_t *td;
 };
 
 struct ap_threadattr_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     pthread_attr_t *attr;
 };
 
 struct ap_threadkey_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     pthread_key_t key;
 };
 #endif
 
 struct ap_procattr_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     ap_file_t *parent_in;
     ap_file_t *child_in;
     ap_file_t *parent_out;
@@ -112,7 +112,7 @@ struct ap_procattr_t {
 };
 
 struct ap_proc_t {
-    ap_context_t *cntxt;
+    ap_pool_t *cntxt;
     pid_t pid;
     struct ap_procattr_t *attr;
 };
@@ -120,7 +120,7 @@ struct ap_proc_t {
 /*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 ap_proc_t **, ap_context_t *);
+ap_status_t ap_detach(struct ap_proc_t **, ap_pool_t *);
 
 #endif  /* ! THREAD_PROC_H */