prefix libapr functions and types with apr_

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

2 files changed, 16 insertions, 16 deletions

diff --git a/dso/os2/dso.c b/dso/os2/dso.c
index 5bd913b2e..d7706f138 100644
--- a/dso/os2/dso.c
+++ b/dso/os2/dso.c
@@ -60,38 +60,38 @@
 
 #if APR_HAS_DSO
 
-static ap_status_t dso_cleanup(void *thedso)
+static apr_status_t dso_cleanup(void *thedso)
 {
-    ap_dso_handle_t *dso = thedso;
-    return ap_dso_unload(dso);
+    apr_dso_handle_t *dso = thedso;
+    return apr_dso_unload(dso);
 }
 
 
-ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, ap_pool_t *ctx)
+apr_status_t apr_dso_load(apr_dso_handle_t **res_handle, const char *path, apr_pool_t *ctx)
 {
     char failed_module[20];
     HMODULE handle;
     int rc;
 
-    *res_handle = ap_pcalloc(ctx, sizeof(*res_handle));
+    *res_handle = apr_pcalloc(ctx, sizeof(*res_handle));
     (*res_handle)->cont = ctx;
     (*res_handle)->load_error = APR_SUCCESS;
     (*res_handle)->failed_module = NULL;
 
     if ((rc = DosLoadModule(failed_module, sizeof(failed_module), path, &handle)) != 0) {
         (*res_handle)->load_error = APR_OS2_STATUS(rc);
-        (*res_handle)->failed_module = ap_pstrdup(ctx, failed_module);
+        (*res_handle)->failed_module = apr_pstrdup(ctx, failed_module);
         return APR_OS2_STATUS(rc);
     }
 
     (*res_handle)->handle  = handle;
-    ap_register_cleanup(ctx, *res_handle, dso_cleanup, ap_null_cleanup);
+    apr_register_cleanup(ctx, *res_handle, dso_cleanup, apr_null_cleanup);
     return APR_SUCCESS;
 }
 
 
 
-ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
+apr_status_t apr_dso_unload(apr_dso_handle_t *handle)
 {
     int rc;
 
@@ -108,8 +108,8 @@ ap_status_t ap_dso_unload(ap_dso_handle_t *handle)
 
 
 
-ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, 
-                       ap_dso_handle_t *handle, 
+apr_status_t apr_dso_sym(apr_dso_handle_sym_t *ressym, 
+                       apr_dso_handle_t *handle, 
                        const char *symname)
 {
     PFN func;
@@ -127,14 +127,14 @@ ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym,
 
 
 
-char *ap_dso_error(ap_dso_handle_t *dso, char *buffer, ap_size_t buflen)
+char *apr_dso_error(apr_dso_handle_t *dso, char *buffer, apr_size_t buflen)
 {
     char message[200];
-    ap_strerror(dso->load_error, message, sizeof(message));
+    apr_strerror(dso->load_error, message, sizeof(message));
     strcat(message, " (");
     strcat(message, dso->failed_module);
     strcat(message, ")");
-    ap_cpystrn(buffer, message, buflen);
+    apr_cpystrn(buffer, message, buflen);
     return buffer;
 }
 
diff --git a/dso/os2/dso.h b/dso/os2/dso.h
index b37e1a54c..1597c81d1 100644
--- a/dso/os2/dso.h
+++ b/dso/os2/dso.h
@@ -66,10 +66,10 @@
 
 #if APR_HAS_DSO
 
-struct ap_dso_handle_t {
-    ap_pool_t  *cont;       /* Context for returning error strings */
+struct apr_dso_handle_t {
+    apr_pool_t  *cont;       /* Context for returning error strings */
     HMODULE       handle;     /* Handle to the DSO loaded            */
-    ap_status_t   load_error;
+    apr_status_t   load_error;
     char          *failed_module;
 };