diff options
author | Doug MacEachern <dougm@apache.org> | 2000-08-02 05:26:45 +0000 |
---|---|---|
committer | Doug MacEachern <dougm@apache.org> | 2000-08-02 05:26:45 +0000 |
commit | 1a1463dbfc6e28b6a5852142b0c87d4abe33c3d9 (patch) | |
tree | 4da0bfd73d36292921960aaabc877a57e680b8c4 /dso/aix | |
parent | 4dd06339dd5b46bd735c56dc3738146416f52ccf (diff) | |
download | apr-1a1463dbfc6e28b6a5852142b0c87d4abe33c3d9.tar.gz |
prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@60470 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'dso/aix')
-rw-r--r-- | dso/aix/dso.c | 12 | ||||
-rw-r--r-- | dso/aix/dso.h | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/dso/aix/dso.c b/dso/aix/dso.c index 9c92aa04d..5e10b4ce2 100644 --- a/dso/aix/dso.c +++ b/dso/aix/dso.c @@ -132,21 +132,21 @@ struct dl_info { * add the basic "wrappers" here. */ -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) { void *os_handle = dlopen((char *)path, RTLD_NOW | RTLD_GLOBAL); if(os_handle == NULL) return APR_EDSOOPEN; - *res_handle = ap_pcalloc(ctx, sizeof(*res_handle)); + *res_handle = apr_pcalloc(ctx, sizeof(*res_handle)); (*res_handle)->handle = (void*)os_handle; (*res_handle)->cont = ctx; 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) { if (dlclose(handle->handle) != 0) return APR_EINIT; @@ -154,8 +154,8 @@ ap_status_t ap_dso_unload(ap_dso_handle_t *handle) return APR_SUCCESS; } -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) { void *retval = dlsym(handle->handle, symname); diff --git a/dso/aix/dso.h b/dso/aix/dso.h index ae89f9ee5..6b7ca8ea7 100644 --- a/dso/aix/dso.h +++ b/dso/aix/dso.h @@ -68,8 +68,8 @@ void *dlsym(void *handle, const char *symbol); const char *dlerror(void); int dlclose(void *handle); -struct ap_dso_handle_t { - ap_pool_t *cont; +struct apr_dso_handle_t { + apr_pool_t *cont; void *handle; }; |