summaryrefslogtreecommitdiff
path: root/include/apr_global_mutex.h
diff options
context:
space:
mode:
authortrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2009-11-21 14:40:20 +0000
committertrawick <trawick@13f79535-47bb-0310-9956-ffa450edef68>2009-11-21 14:40:20 +0000
commitf1d5da136721c6eead2e3d083475de7d27ab4c69 (patch)
tree89b421df94472648d2e2210b3d13b37e546ff73c /include/apr_global_mutex.h
parent5dccc7d0ca5ab08cf5db4c0b4eec8ced9e9fdf60 (diff)
downloadlibapr-f1d5da136721c6eead2e3d083475de7d27ab4c69.tar.gz
merge r882915 from trunk:
add missing apr_global_mutex_lockfile(), corresponding to apr_proc_mutex_lockfile() git-svn-id: http://svn.apache.org/repos/asf/apr/apr/branches/1.4.x@882916 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include/apr_global_mutex.h')
-rw-r--r--include/apr_global_mutex.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/include/apr_global_mutex.h b/include/apr_global_mutex.h
index 9316001ce..142e887a0 100644
--- a/include/apr_global_mutex.h
+++ b/include/apr_global_mutex.h
@@ -121,6 +121,12 @@ APR_DECLARE(apr_status_t) apr_global_mutex_unlock(apr_global_mutex_t *mutex);
APR_DECLARE(apr_status_t) apr_global_mutex_destroy(apr_global_mutex_t *mutex);
/**
+ * Return the name of the lockfile for the mutex, or NULL
+ * if the mutex doesn't use a lock file
+ */
+APR_DECLARE(const char *) apr_global_mutex_lockfile(apr_global_mutex_t *mutex);
+
+/**
* Get the pool used by this global_mutex.
* @return apr_pool_t the pool
*/
@@ -140,6 +146,7 @@ APR_POOL_DECLARE_ACCESSOR(global_mutex);
#define apr_global_mutex_trylock apr_proc_mutex_trylock
#define apr_global_mutex_unlock apr_proc_mutex_unlock
#define apr_global_mutex_destroy apr_proc_mutex_destroy
+#define apr_global_mutex_lockfile apr_proc_mutex_lockfile
#define apr_global_mutex_pool_get apr_proc_mutex_pool_get
#endif