dreid 01/04/18 13:37:40
Modified: include apr_portable.h
Log:
This commit adds
- apr_os_dso_handle_t type to Win32 and BeOS
- apr_os_dso_handle_get/put
This would seem to fill in a hole that we've overlooked until
now. Code to follow.
Revision Changes Path
1.48 +24 -0 apr/include/apr_portable.h
Index: apr_portable.h
===================================================================
RCS file: /home/cvs/apr/include/apr_portable.h,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- apr_portable.h 2001/03/21 22:33:42 1.47
+++ apr_portable.h 2001/04/18 20:37:39 1.48
@@ -101,6 +101,7 @@
typedef DWORD apr_os_threadkey_t;
typedef FILETIME apr_os_imp_time_t;
typedef SYSTEMTIME apr_os_exp_time_t;
+typedef HANDLE apr_os_dso_handle_t;
#elif defined(OS2)
typedef HFILE apr_os_file_t;
@@ -112,6 +113,7 @@
typedef PULONG apr_os_threadkey_t;
typedef struct timeval apr_os_imp_time_t;
typedef struct tm apr_os_exp_time_t;
+/* insert dso typedef here */
#elif defined(__BEOS__)
#include <kernel/OS.h>
@@ -134,6 +136,7 @@
typedef int apr_os_threadkey_t;
typedef struct timeval apr_os_imp_time_t;
typedef struct tm apr_os_exp_time_t;
+typedef image_id apr_os_dso_handle_t;
#else
/* Any other OS should go above this one. This is the lowest common
@@ -180,6 +183,7 @@
typedef pid_t apr_os_proc_t;
typedef struct timeval apr_os_imp_time_t;
typedef struct tm apr_os_exp_time_t;
+/* insert dso typedef here */
#endif
/**
@@ -382,6 +386,26 @@
apr_pool_t *cont);
#endif /* APR_HAS_THREADS */
+
+/**
+ * convert the dso handle from os specific to apr
+ * @param dso The apr handle we are converting to
+ * @param thedso the os specific handle to convert
+ * @param pool the pool to use if it is needed
+ * @deffunc apr_status_t apr_os_dso_handle_put(apr_dso_handle_t **dso,
apr_os_dso_handle_t *thedso, apr_pool_t *pool)
+ */
+APR_DECLARE(apr_status_t) apr_os_dso_handle_put(apr_dso_handle_t **dso,
+ apr_os_dso_handle_t *thedso,
+ apr_pool_t *pool);
+
+/**
+ * convert the apr dso handle into an os specific one
+ * @param aprdso The apr dso handle to convert
+ * @param dso The os specific dso to return
+ * @deffunc apr_status_t apr_os_dso_handle_get(apr_os_dso_handle_t *dso,
apr_dso_handle_t *aprdso);
+ */
+APR_DECLARE(apr_status_t) apr_os_dso_handle_get(apr_os_dso_handle_t *dso,
+ apr_dso_handle_t *aprdso);
#ifdef __cplusplus
}
