summaryrefslogtreecommitdiff
path: root/locks
diff options
context:
space:
mode:
authorjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2004-06-15 08:21:22 +0000
committerjorton <jorton@13f79535-47bb-0310-9956-ffa450edef68>2004-06-15 08:21:22 +0000
commit4cb6ddd22f411f46ab77ce123e7997ba6868812b (patch)
tree29d29e4d6af27ead243e37a57feda5bf01abd5e6 /locks
parentcfb770305876762fed3f81e3536f485c7a75f318 (diff)
downloadlibapr-4cb6ddd22f411f46ab77ce123e7997ba6868812b.tar.gz
* locks/unix/proc_mutex.c (apr_proc_mutex_lockfile): Fix build on
platforms without flock. git-svn-id: http://svn.apache.org/repos/asf/apr/apr/trunk@65200 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'locks')
-rw-r--r--locks/unix/proc_mutex.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/locks/unix/proc_mutex.c b/locks/unix/proc_mutex.c
index 5de0040e3..2e614b232 100644
--- a/locks/unix/proc_mutex.c
+++ b/locks/unix/proc_mutex.c
@@ -811,10 +811,16 @@ APR_DECLARE(const char *) apr_proc_mutex_lockfile(apr_proc_mutex_t *mutex)
{
/* POSIX sems use the fname field but don't use a file,
* so be careful. */
- if (mutex->meth == &mutex_flock_methods
- || mutex->meth == &mutex_fcntl_methods) {
+#if APR_HAS_FLOCK_SERIALIZE
+ if (mutex->meth == &mutex_flock_methods) {
+ return mutex->fname;
+ }
+#endif
+#if APR_HAS_FCNTL_SERIALIZE
+ if (mutex->meth == &mutex_fcntl_methods) {
return mutex->fname;
}
+#endif
return NULL;
}