Finish the APR naming cleanup. This removes the struct's from

apr_variable declarations.  This works on Unix, but a test compile
on other platforms would be a good idea.


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

3 files changed, 12 insertions, 12 deletions

diff --git a/include/apr_portable.h b/include/apr_portable.h
index 815b70126..ea4503e85 100644
--- a/include/apr_portable.h
+++ b/include/apr_portable.h
@@ -187,7 +187,7 @@ ap_status_t ap_get_os_exp_time(ap_os_exp_time_t **, ap_exploded_time_t *);
 ap_status_t ap_get_os_imp_time(ap_os_imp_time_t **, ap_time_t *);     
 #if APR_HAS_THREADS
 ap_status_t ap_get_os_thread(ap_os_thread_t *thethd, ap_thread_t *thd);
-ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_key_t *key);
+ap_status_t ap_get_os_threadkey(ap_os_threadkey_t *thekey, ap_threadkey_t *key);
 #endif
 
 ap_status_t ap_put_os_file(ap_file_t **file, ap_os_file_t *thefile, 
@@ -205,7 +205,7 @@ ap_status_t ap_put_os_exp_time(ap_exploded_time_t *, ap_os_exp_time_t **, ap_con
 #if APR_HAS_THREADS
 ap_status_t ap_put_os_thread(ap_thread_t **thd, ap_os_thread_t *thethd, 
                              ap_context_t *cont);
-ap_status_t ap_put_os_threadkey(ap_key_t **key, ap_os_threadkey_t *thekey, 
+ap_status_t ap_put_os_threadkey(ap_threadkey_t **key, ap_os_threadkey_t *thekey, 
                                 ap_context_t *cont);
 #endif
 
diff --git a/include/apr_thread_proc.h b/include/apr_thread_proc.h
index a7581a141..ef2725804 100644
--- a/include/apr_thread_proc.h
+++ b/include/apr_thread_proc.h
@@ -82,7 +82,7 @@ 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 ap_threadkey_t        ap_key_t;
+typedef struct ap_threadkey_t        ap_threadkey_t;
 
 typedef void *(API_THREAD_FUNC *ap_thread_start_t)(void *);
 
@@ -105,15 +105,15 @@ ap_status_t ap_set_threaddata(void *data, char *key,
                               ap_status_t (*cleanup) (void *), 
                               ap_thread_t *thread);
 
-ap_status_t ap_create_thread_private(ap_key_t **key, void (*dest)(void *), 
+ap_status_t ap_create_thread_private(ap_threadkey_t **key, void (*dest)(void *), 
                                      ap_context_t *cont);
-ap_status_t ap_get_thread_private(void **new, ap_key_t *key);
-ap_status_t ap_set_thread_private(void *priv, ap_key_t *key);
-ap_status_t ap_delete_thread_private(ap_key_t *key);
-ap_status_t ap_get_threadkeydata(void **data, char *key, ap_key_t *threadkey);
+ap_status_t ap_get_thread_private(void **new, ap_threadkey_t *key);
+ap_status_t ap_set_thread_private(void *priv, ap_threadkey_t *key);
+ap_status_t ap_delete_thread_private(ap_threadkey_t *key);
+ap_status_t ap_get_threadkeydata(void **data, char *key, ap_threadkey_t *threadkey);
 ap_status_t ap_set_threadkeydata(void *data, char *key,
                                  ap_status_t (*cleanup) (void *), 
-                                 ap_key_t *threadkey);
+                                 ap_threadkey_t *threadkey);
 
 /* Process Function definitions */
 ap_status_t ap_createprocattr_init(ap_procattr_t **new, ap_context_t *cont);
diff --git a/include/arch/unix/mmap.c b/include/arch/unix/mmap.c
index 3cfcda7b3..8ac7abdc0 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 ap_mmap_t *mm = themmap;
+    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 ap_mmap_t *)ap_palloc(cont, sizeof(struct ap_mmap_t));
+    (*new) = (ap_mmap_t *)ap_palloc(cont, sizeof(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 ap_mmap_t *mmap)
+ap_status_t ap_mmap_delete(ap_mmap_t *mmap)
 {
     ap_status_t rv;