diff options
| author | Ryan Bloom <rbb@apache.org> | 2000-03-27 19:02:18 +0000 |
|---|---|---|
| committer | Ryan Bloom <rbb@apache.org> | 2000-03-27 19:02:18 +0000 |
| commit | 3570ddb76ede55546cb6b844b317b0ac4445fc20 (patch) | |
| tree | adabd8379db5f6eec4dec9ea822e330bd8d9c447 /include | |
| parent | 0b2fca63da04310db0e85883860ac7b4d1430afa (diff) | |
| download | apr-3570ddb76ede55546cb6b844b317b0ac4445fc20.tar.gz | |
Add DSO's to the APR build process. This also cleans up the DSO stuff, to
make it look more like the rest of APR.
git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@59740 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/apr_dso.h | 14 | ||||
| -rw-r--r-- | include/apr_errno.h | 4 | ||||
| -rw-r--r-- | include/arch/unix/dso.h | 7 |
3 files changed, 15 insertions, 10 deletions
diff --git a/include/apr_dso.h b/include/apr_dso.h index cd82b26be..e2de5e679 100644 --- a/include/apr_dso.h +++ b/include/apr_dso.h @@ -61,17 +61,17 @@ extern "C" { #endif -typedef struct ap_dso_handle_st ap_dso_handle_t; -typedef void * ap_dso_handle_sym_t; +typedef struct dso_handle_t ap_dso_handle_t; +typedef void * ap_dso_handle_sym_t; ap_status_t ap_dso_init(void); -ap_status_t ap_dso_load(const char *path, ap_context_t *ctx, - ap_dso_handle_t **res_handle); +ap_status_t ap_dso_load(ap_dso_handle_t **res_handle, const char *path, + ap_context_t *ctx); ap_status_t ap_dso_unload(ap_dso_handle_t *handle); -ap_status_t ap_dso_sym(ap_dso_handle_t *handle, const char *symname, - ap_dso_handle_sym_t *ressym); +ap_status_t ap_dso_sym(ap_dso_handle_sym_t *ressym, ap_dso_handle_t *handle, + const char *symname); #ifdef __cplusplus } #endif -#endif
\ No newline at end of file +#endif diff --git a/include/apr_errno.h b/include/apr_errno.h index 603683fbe..03b64a454 100644 --- a/include/apr_errno.h +++ b/include/apr_errno.h @@ -108,6 +108,10 @@ typedef int ap_status_t; #define APR_ENOTHDKEY (APR_OS_START_ERROR + 13) #define APR_ENOTTHREADSAFE (APR_OS_START_ERROR + 14) #define APR_ESHMLOCK (APR_OS_START_ERROR + 15) +#define APR_EFUNCNOTFOUND (APR_OS_START_ERROR + 16) +#define APR_ENOFUNCPOINTER (APR_OS_START_ERROR + 17) +#define APR_ENODSOHANDLE (APR_OS_START_ERROR + 18) +#define APR_EDSOOPEN (APR_OS_START_ERROR + 19) /* APR STATUS VALUES */ #define APR_INCHILD (APR_OS_START_STATUS + 1) diff --git a/include/arch/unix/dso.h b/include/arch/unix/dso.h index b0081e3c8..2fe7b43f9 100644 --- a/include/arch/unix/dso.h +++ b/include/arch/unix/dso.h @@ -61,10 +61,11 @@ #include "apr_general.h" #include "apr_pools.h" #include "apr_dso.h" +#include "ltdl.h" -struct ap_dso_handle_st { +struct dso_handle_t { + ap_context_t *cont; lt_dlhandle handle; /* libtool handle */ - ap_context_t cont; }; -#endif
\ No newline at end of file +#endif |